games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fixed #687.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2011-03-19 14:35:29 +00:00
parent fb929fa9b0
commit 5e4140762f
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/CPreGame.cpp
View File

@@ -167,7 +167,7 @@ void updateStartInfo(std::string filename, StartInfo & sInfo, const CMapHeader *
setPlayer(pset, 0, playerNames);
pset.castle = pinfo.defaultCastle();
pset.hero = pinfo.defaultHero(mapHeader->version==CMapHeader::RoE);
pset.hero = pinfo.defaultHero();
if(pinfo.mainHeroName.length())

2
lib/CGameState.cpp
View File

@@ -1056,7 +1056,7 @@ void CGameState::init( StartInfo * si, ui32 checksum, int Seed )
for(int i=0;i<PLAYER_LIMIT;i++)
{
const PlayerInfo &p = map->players[i];
bool generateHero = (p.generateHeroAtMainTown && p.hasMainTown) || (p.hasMainTown && map->version==CMapHeader::RoE);
bool generateHero = (p.generateHeroAtMainTown && p.hasMainTown);
if(generateHero && vstd::contains(scenarioOps->playerInfos, i))
{
int3 hpos = p.posOfMainTown;

2
lib/map.cpp
View File

@@ -229,7 +229,7 @@ void CMapHeader::loadPlayerInfo( int &pom, const unsigned char * bufor, int &i )
}
else
{
players[pom].generateHeroAtMainTown = false;
players[pom].generateHeroAtMainTown = true;
players[pom].generateHero = false;
}

4
lib/map.h
View File

@@ -125,9 +125,9 @@ struct DLL_EXPORT PlayerInfo
}
return ret;
}
si8 defaultHero(bool isMapRoE = false) const
si8 defaultHero() const
{
if ( ((generateHeroAtMainTown || isMapRoE) && hasMainTown) //we will generate hero in front of main town
if ((generateHeroAtMainTown && hasMainTown) //we will generate hero in front of main town
|| p8) //random hero
return -1;
else