DjWarmonger 10 years ago
parent
commit
a8ff08a562
1 changed files with 4 additions and 1 deletions
  1. 4 1
      server/CGameHandler.cpp

+ 4 - 1
server/CGameHandler.cpp

@@ -2683,7 +2683,10 @@ bool CGameHandler::recruitCreatures(ObjectInstanceID objid, ObjectInstanceID dst
 bool CGameHandler::upgradeCreature( ObjectInstanceID objid, SlotID pos, CreatureID upgID )
 bool CGameHandler::upgradeCreature( ObjectInstanceID objid, SlotID pos, CreatureID upgID )
 {
 {
 	CArmedInstance *obj = static_cast<CArmedInstance*>(gs->getObjInstance(objid));
 	CArmedInstance *obj = static_cast<CArmedInstance*>(gs->getObjInstance(objid));
-	assert(obj->hasStackAtSlot(pos));
+	if (!obj->hasStackAtSlot(pos))
+	{
+		COMPLAIN_RET("Cannot upgrade, no stack at slot " + boost::to_string(pos));
+	}
 	UpgradeInfo ui = gs->getUpgradeInfo(obj->getStack(pos));
 	UpgradeInfo ui = gs->getUpgradeInfo(obj->getStack(pos));
 	PlayerColor player = obj->tempOwner;
 	PlayerColor player = obj->tempOwner;
 	const PlayerState *p = getPlayer(player);
 	const PlayerState *p = getPlayer(player);