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

16
client/mapView/mapHandler.cpp
View File

@@ -144,16 +144,16 @@ bool CMapHandler::isInMap(const int3 & tile)
return map->isInTheMap(tile);
}
void CMapHandler::onObjectFadeIn(const CGObjectInstance * obj)
void CMapHandler::onObjectFadeIn(const CGObjectInstance * obj, const PlayerColor & initiator)
{
for(auto * observer : observers)
observer->onObjectFadeIn(obj);
observer->onObjectFadeIn(obj, initiator);
}
void CMapHandler::onObjectFadeOut(const CGObjectInstance * obj)
void CMapHandler::onObjectFadeOut(const CGObjectInstance * obj, const PlayerColor & initiator)
{
for(auto * observer : observers)
observer->onObjectFadeOut(obj);
observer->onObjectFadeOut(obj, initiator);
}
void CMapHandler::onBeforeHeroEmbark(const CGHeroInstance * obj, const int3 & from, const int3 & dest)
@@ -180,16 +180,16 @@ void CMapHandler::onAfterHeroDisembark(const CGHeroInstance * obj, const int3 &
observer->onAfterHeroDisembark(obj, from, dest);
}
void CMapHandler::onObjectInstantAdd(const CGObjectInstance * obj)
void CMapHandler::onObjectInstantAdd(const CGObjectInstance * obj, const PlayerColor & initiator)
{
for(auto * observer : observers)
observer->onObjectInstantAdd(obj);
observer->onObjectInstantAdd(obj, initiator);
}
void CMapHandler::onObjectInstantRemove(const CGObjectInstance * obj)
void CMapHandler::onObjectInstantRemove(const CGObjectInstance * obj, const PlayerColor & initiator)
{
for(auto * observer : observers)
observer->onObjectInstantRemove(obj);
observer->onObjectInstantRemove(obj, initiator);
}
void CMapHandler::onAfterHeroTeleported(const CGHeroInstance * obj, const int3 & from, const int3 & dest)