games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

CGameHandler: use ObjProperty enum instead of magic numbers

Browse Source
This commit is contained in:
Arseniy Shestakov
2016-09-09 17:42:16 +03:00
parent 41abce102e
commit 6747555339
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/CGameHandler.cpp
View File

@@ -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};