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

Fix Orrin as starting hero on some maps

Browse Source 
Fixes a bug that led to Orrin being replaced with a different randomly
selected hero on maps where starting hero is not generated in town, but
pre-placed on map
This commit is contained in:
Ivan Savenko
2024-11-24 20:05:34 +00:00
parent a4417f3fc5
commit 1116c18af5
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gameState/CGameState.cpp
View File

@ -62,7 +62,7 @@ boost::shared_mutex CGameState::mutex;
HeroTypeID CGameState::pickNextHeroType(const PlayerColor & owner) HeroTypeID CGameState::pickNextHeroType(const PlayerColor & owner)
{ {
const PlayerSettings &ps = scenarioOps->getIthPlayersSettings(owner); const PlayerSettings &ps = scenarioOps->getIthPlayersSettings(owner);
if(ps.hero >= HeroTypeID(0) && !isUsedHero(HeroTypeID(ps.hero))) //we haven't used selected hero if(ps.hero.isValid() && !isUsedHero(HeroTypeID(ps.hero))) //we haven't used selected hero
{ {
return HeroTypeID(ps.hero); return HeroTypeID(ps.hero);
} }

4
lib/mapObjects/CGHeroInstance.cpp
View File

@ -661,8 +661,10 @@ void CGHeroInstance::pickRandomObject(vstd::RNG & rand)
if (ID == Obj::RANDOM_HERO) if (ID == Obj::RANDOM_HERO)
{ {
auto selectedHero = cb->gameState()->pickNextHeroType(getOwner());
ID = Obj::HERO; ID = Obj::HERO;
subID = cb->gameState()->pickNextHeroType(getOwner()); subID = selectedHero;
randomizeArmy(getHeroClass()->faction); randomizeArmy(getHeroClass()->faction);
} }