Bläddra i källkod

CGameHandler: use ObjProperty enum instead of magic numbers

Arseniy Shestakov 9 år sedan
förälder
incheckning
6747555339
1 ändrade filer med 3 tillägg och 3 borttagningar
  1. 3 3
      server/CGameHandler.cpp

+ 3 - 3
server/CGameHandler.cpp

@@ -1913,7 +1913,7 @@ void CGameHandler::giveSpells(const CGTownInstance *t, const CGHeroInstance *h)
 
 
 void CGameHandler::setBlockVis(ObjectInstanceID objid, bool bv)
 void CGameHandler::setBlockVis(ObjectInstanceID objid, bool bv)
 {
 {
-	SetObjectProperty sop(objid,2,bv);
+	SetObjectProperty sop(objid, ObjProperty::BLOCKVIS, bv);
 	sendAndApply(&sop);
 	sendAndApply(&sop);
 }
 }
 
 
@@ -1935,7 +1935,7 @@ bool CGameHandler::removeObject( const CGObjectInstance * obj )
 
 
 void CGameHandler::setAmount(ObjectInstanceID objid, ui32 val)
 void CGameHandler::setAmount(ObjectInstanceID objid, ui32 val)
 {
 {
-	SetObjectProperty sop(objid,3,val);
+	SetObjectProperty sop(objid, ObjProperty::PRIMARY_STACK_COUNT, val);
 	sendAndApply(&sop);
 	sendAndApply(&sop);
 }
 }
 
 
@@ -2151,7 +2151,7 @@ bool CGameHandler::teleportHero(ObjectInstanceID hid, ObjectInstanceID dstid, ui
 void CGameHandler::setOwner(const CGObjectInstance * obj, PlayerColor owner)
 void CGameHandler::setOwner(const CGObjectInstance * obj, PlayerColor owner)
 {
 {
 	PlayerColor oldOwner = getOwner(obj->id);
 	PlayerColor oldOwner = getOwner(obj->id);
-	SetObjectProperty sop(obj->id, 1, owner.getNum());
+	SetObjectProperty sop(obj->id, ObjProperty::OWNER, owner.getNum());
 	sendAndApply(&sop);
 	sendAndApply(&sop);
 
 
 	std::set<PlayerColor> playerColors = {owner, oldOwner};
 	std::set<PlayerColor> playerColors = {owner, oldOwner};