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

Merge pull request #2327 from IvanSavenko/bugfixing_from_stream

Browse Source 
Fix accumulated minor bugs
This commit is contained in:
Ivan Savenko
2023-07-15 21:55:19 +03:00
committed by GitHub
parent 2673eb8798 199f9eb6f5
commit a4ba5a9b65
41 changed files with 383 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/NetPacksLib.cpp
View File

@ -1124,7 +1124,16 @@ void RemoveObject::applyGs(CGameState *gs)
PlayerState * p = gs->getPlayerState(beatenHero->tempOwner);
gs->map->heroesOnMap -= beatenHero;
p->heroes -= beatenHero;
beatenHero->detachFrom(*beatenHero->whereShouldBeAttachedOnSiege(gs));
auto * siegeNode = beatenHero->whereShouldBeAttachedOnSiege(gs);
// FIXME: workaround:
// hero should be attached to siegeNode after battle
// however this code might also be called on dismissing hero while in town
if (siegeNode && vstd::contains(beatenHero->getParentNodes(), siegeNode))
beatenHero->detachFrom(*siegeNode);
beatenHero->tempOwner = PlayerColor::NEUTRAL; //no one owns beaten hero
vstd::erase_if(beatenHero->artifactsInBackpack, [](const ArtSlotInfo& asi)
{