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

More work on auto-fight.

Browse Source 
Dynamic libraries return smart-pointers to what they create.
This commit is contained in:
Michał W. Urbańczyk
2013-06-22 21:47:51 +00:00
parent 2be2143844
commit 4a0587d500
15 changed files with 130 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CCallback.cpp
View File

@@ -361,7 +361,7 @@ void CCallback::validatePaths()
ASSERT_IF_CALLED_WITH_PLAYER
const CGHeroInstance *h = cl->IGameCallback::getSelectedHero(*player);
if(h && ( cl->pathInfo->hero != h //wrong hero
|| cl->pathInfo->hpos != h->getPosition(false) //wrong hero positoin
|| cl->pathInfo->hpos != h->getPosition(false) //wrong hero position
|| !cl->pathInfo->isValid)) //paths invalidated by game event
{
recalculatePaths();
@@ -376,25 +376,25 @@ int CCallback::mergeOrSwapStacks(const CArmedInstance *s1, const CArmedInstance
return swapCreatures(s1, s2, p1, p2);
}
void CCallback::registerGameInterface(CGameInterface *cgi)
void CCallback::registerGameInterface(shared_ptr<CGameInterface> cgi)
{
cl->additionalPlayerInts[*player].push_back(cgi);
registerBattleInterface(cgi);
}
void CCallback::registerBattleInterface(CBattleGameInterface *cbga)
void CCallback::registerBattleInterface(shared_ptr<CBattleGameInterface> cbga)
{
cl->additionalBattleInts[*player].push_back(cbga);
}
void CCallback::unregisterGameInterface(CGameInterface *cgi)
void CCallback::unregisterGameInterface(shared_ptr<CGameInterface> cgi)
{
cl->additionalPlayerInts[*player] -= cgi;
unregisterBattleInterface(cgi);
}
void CCallback::unregisterBattleInterface(CBattleGameInterface *cbga)
void CCallback::unregisterBattleInterface(shared_ptr<CBattleGameInterface> cbga)
{
cl->additionalBattleInts[*player] -= cbga;
}