games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Fixed #1652.

Browse Source
This commit is contained in:
Michał W. Urbańczyk 2014-02-09 09:57:00 +00:00
parent 343dd1a7d1
commit 30aa07f86c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/CGameState.cpp
View File

@ -1319,11 +1319,11 @@ void CGameState::prepareCrossoverHeroes(std::vector<CGameState::CampaignHeroRepl
auto artifactPosition = ArtifactPosition(i); auto artifactPosition = ArtifactPosition(i);
if(artifactPosition == ArtifactPosition::SPELLBOOK) continue; // do not handle spellbook this way if(artifactPosition == ArtifactPosition::SPELLBOOK) continue; // do not handle spellbook this way
// TODO: why would there be nullptr artifacts?
const ArtSlotInfo *info = hero->getSlot(artifactPosition); const ArtSlotInfo *info = hero->getSlot(artifactPosition);
if(!info) if(!info)
continue; continue;
// TODO: why would there be nullptr artifacts?
const CArtifactInstance *art = info->artifact; const CArtifactInstance *art = info->artifact;
if(!art) if(!art)
continue; continue;
@ -1352,6 +1352,17 @@ void CGameState::prepareCrossoverHeroes(std::vector<CGameState::CampaignHeroRepl
if(shouldSlotBeErased(slotPair)) if(shouldSlotBeErased(slotPair))
cgh->eraseStack(slotPair.first); cgh->eraseStack(slotPair.first);
} }
// Removing short-term bonuses
for(CGHeroInstance * cgh : crossoverHeroes)
{
cgh->popBonuses(Selector::durationType(Bonus::ONE_DAY));
cgh->popBonuses(Selector::durationType(Bonus::ONE_WEEK));
cgh->popBonuses(Selector::durationType(Bonus::N_TURNS));
cgh->popBonuses(Selector::durationType(Bonus::N_DAYS));
cgh->popBonuses(Selector::durationType(Bonus::ONE_BATTLE));
}
} }
void CGameState::placeStartingHeroes() void CGameState::placeStartingHeroes()