games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Added initiator-player to packs that add/remove/move objects

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-18 22:09:55 +03:00
parent 3cdc3daa2c
commit 8c0d78f1d9
30 changed files with 152 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/CGameHandler.cpp
View File

@@ -1045,7 +1045,7 @@ void CGameHandler::giveSpells(const CGTownInstance *t, const CGHeroInstance *h)
sendAndApply(&cs);
}
bool CGameHandler::removeObject(const CGObjectInstance * obj)
bool CGameHandler::removeObject(const CGObjectInstance * obj, const PlayerColor & initiator)
{
if (!obj || !getObj(obj->id))
{
@@ -1054,7 +1054,8 @@ bool CGameHandler::removeObject(const CGObjectInstance * obj)
}
RemoveObject ro;
ro.id = obj->id;
ro.objectID = obj->id;
ro.initiator = initiator;
sendAndApply(&ro);
checkVictoryLossConditionsForAll(); //eg if monster escaped (removing objs after battle is done dircetly by endBattle, not this function)
@@ -1110,8 +1111,9 @@ bool CGameHandler::moveHero(ObjectInstanceID hid, int3 dst, ui8 teleporting, boo
const bool standAtObstacle = t.blocked && !t.visitable;
const bool standAtWater = !h->boat && t.terType->isWater() && (t.visitableObjects.empty() || !t.visitableObjects.back()->isCoastVisitable());
auto const complainRet = [&](const std::string & message){
const auto complainRet = [&](const std::string & message)
{
//send info about movement failure
complain(message);
sendAndApply(&tmh);
@@ -1504,11 +1506,12 @@ void CGameHandler::giveHero(ObjectInstanceID id, PlayerColor player, ObjectInsta
changeFogOfWar(h->pos, h->getSightRadius(), player, false);
}
void CGameHandler::changeObjPos(ObjectInstanceID objid, int3 newPos)
void CGameHandler::changeObjPos(ObjectInstanceID objid, int3 newPos, const PlayerColor & initiator)
{
ChangeObjPos cop;
cop.objid = objid;
cop.nPos = newPos;
cop.initiator = initiator;
sendAndApply(&cop);
}
@@ -3462,7 +3465,7 @@ bool CGameHandler::buildBoat(ObjectInstanceID objid, PlayerColor playerID)
}
giveResources(playerID, -boatCost);
createObject(tile, Obj::BOAT, obj->getBoatType().getNum());
createObject(tile, playerID, Obj::BOAT, obj->getBoatType().getNum());
return true;
}
@@ -3538,7 +3541,7 @@ void CGameHandler::checkVictoryLossConditionsForPlayer(PlayerColor player)
for (auto h : hlp) //eliminate heroes
{
if (h.get())
removeObject(h);
removeObject(h, player);
}
//player lost -> all his objects become unflagged (neutral)
@@ -3587,7 +3590,7 @@ bool CGameHandler::dig(const CGHeroInstance *h)
if (h->diggingStatus() != EDiggingStatus::CAN_DIG) //checks for terrain and movement
COMPLAIN_RETF("Hero cannot dig (error code %d)!", static_cast<int>(h->diggingStatus()));
createObject(h->visitablePos(), Obj::HOLE, 0 );
createObject(h->visitablePos(), h->getOwner(), Obj::HOLE, 0 );
//take MPs
SetMovePoints smp;
@@ -3981,7 +3984,7 @@ void CGameHandler::spawnWanderingMonsters(CreatureID creatureID)
{
auto count = cre->getRandomAmount(std::rand);
createObject(*tile, Obj::MONSTER, creatureID);
createObject(*tile, PlayerColor::NEUTRAL, Obj::MONSTER, creatureID);
auto monsterId = getTopObj(*tile)->id;
setObjProperty(monsterId, ObjProperty::MONSTER_COUNT, count);
@@ -4123,11 +4126,12 @@ scripting::Pool * CGameHandler::getGlobalContextPool() const
//}
#endif
void CGameHandler::createObject(const int3 & visitablePosition, Obj type, int32_t subtype)
void CGameHandler::createObject(const int3 & visitablePosition, const PlayerColor & initiator, Obj type, int32_t subtype)
{
NewObject no;
no.ID = type;
no.subID= subtype;
no.subID = subtype;
no.initiator = initiator;
no.targetPos = visitablePosition;
sendAndApply(&no);
}