Fixed #947.

client/CMT.cpp

@@ -732,7 +732,7 @@ static void listenForEvents()
 				break;
 			case RESTART_GAME:
 				{
-					StartInfo si = *client->getStartInfo();
+					StartInfo si = *client->getStartInfo(true);
 					endGame();
 					startGame(&si);
 				}

lib/IGameCallback.cpp

@@ -712,10 +712,13 @@ void CGameInfoCallback::getUpgradeInfo(const CArmedInstance *obj, int stackPos,
 	//return gs->getUpgradeInfo(obj->getStack(stackPos));
 }
 
-const StartInfo * CGameInfoCallback::getStartInfo() const
+const StartInfo * CGameInfoCallback::getStartInfo(bool beforeRandomization /*= false*/) const
 {
 	//boost::shared_lock<boost::shared_mutex> lock(*gs->mx);
-	return gs->scenarioOps;
+	if(beforeRandomization)
+		return gs->initialOpts;
+	else
+		return gs->scenarioOps;
 }
 
 int CGameInfoCallback::getSpellCost(const CSpell * sp, const CGHeroInstance * caster) const

lib/IGameCallback.h

@@ -155,7 +155,7 @@ protected:
 public:
 	//various
 	int getDate(int mode=0)const; //mode=0 - total days in game, mode=1 - day of week, mode=2 - current week, mode=3 - current month
-	const StartInfo * getStartInfo()const;
+	const StartInfo * getStartInfo(bool beforeRandomization = false)const;
 	bool isAllowed(int type, int id); //type: 0 - spell; 1- artifact; 2 - secondary skill
 
 	//player