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

CGameHandler::buildStructure: give spells after gs apply. Fix issue 2425

Browse Source 
Hero will also immidiately get new spells when Library built in Tower or Grail in Conflux.
This commit is contained in:
Arseniy Shestakov
2016-03-13 11:31:09 +03:00
parent 113bd1b9ea
commit bee0c6d705
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/CGameHandler.cpp
View File

@@ -2787,8 +2787,8 @@ bool CGameHandler::buildStructure( ObjectInstanceID tid, BuildingID requestedID,
} }
} }
//Performs stuff that has to be done after new building is built //Performs stuff that has to be done before new building is built
auto processBuiltStructure = [t, this](const BuildingID buildingID) auto processBeforeBuiltStructure = [t, this](const BuildingID buildingID)
{ {
if(buildingID >= BuildingID::DWELL_FIRST) //dwelling if(buildingID >= BuildingID::DWELL_FIRST) //dwelling
{ {
@@ -2817,8 +2817,14 @@ bool CGameHandler::buildStructure( ObjectInstanceID tid, BuildingID requestedID,
{ {
setPortalDwelling(t); setPortalDwelling(t);
} }
};
if(buildingID <= BuildingID::MAGES_GUILD_5) //it's mage guild //Performs stuff that has to be done after new building is built
auto processAfterBuiltStructure = [t, this](const BuildingID buildingID)
{
if(buildingID <= BuildingID::MAGES_GUILD_5 || //it's mage guild
(t->subID == ETownType::TOWER && buildingID == BuildingID::LIBRARY) ||
(t->subID == ETownType::CONFLUX && buildingID == BuildingID::GRAIL))
{ {
if(t->visitingHero) if(t->visitingHero)
giveSpells(t,t->visitingHero); giveSpells(t,t->visitingHero);
@@ -2869,9 +2875,9 @@ bool CGameHandler::buildStructure( ObjectInstanceID tid, BuildingID requestedID,
} }
} }
//Other post-built events // FIXME: it's done before NewStructures applied because otherwise town window wont be properly updated on client. That should be actually fixed on client and not on server.
for(auto builtID : ns.bid) for(auto builtID : ns.bid)
processBuiltStructure(builtID); processBeforeBuiltStructure(builtID);
//Take cost //Take cost
if (!force) if (!force)
@@ -2885,6 +2891,10 @@ bool CGameHandler::buildStructure( ObjectInstanceID tid, BuildingID requestedID,
//We know what has been built, appluy changes. Do this as final step to properly update town window //We know what has been built, appluy changes. Do this as final step to properly update town window
sendAndApply(&ns); sendAndApply(&ns);
//Other post-built events. To some logic like giving spells to work gamestate changes for new building must be already in place!
for(auto builtID : ns.bid)
processAfterBuiltStructure(builtID);
// now when everything is built - reveal tiles for lookout tower // now when everything is built - reveal tiles for lookout tower
FoWChange fw; FoWChange fw;
fw.player = t->tempOwner; fw.player = t->tempOwner;