Fixed #687.

client/CPreGame.cpp

@@ -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())

lib/CGameState.cpp

@@ -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;

lib/map.cpp

@@ -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;
 			}
 

lib/map.h

@@ -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