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

CGameHandler::endBattle: change town ownership when hero lost siege

Browse Source
This commit is contained in:
Arseniy Shestakov
2016-02-22 03:35:38 +03:00
parent 9428f865d3
commit f8c6751707
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/CGameHandler.cpp
View File

@@ -673,8 +673,12 @@ void CGameHandler::endBattle(int3 tile, const CGHeroInstance *hero1, const CGHer
} }
if(battleResult.data->winner!=1 && hero2) if(battleResult.data->winner!=1 && hero2)
{ {
auto town = hero2->visitedTown;
RemoveObject ro(hero2->id); RemoveObject ro(hero2->id);
sendAndApply(&ro); sendAndApply(&ro);
if(town && !town->garrisonHero) // TODO: that must be called from CGHeroInstance or CGTownInstance
town->battleFinished(hero1, *battleResult.get());
} }
//give exp //give exp