From 30b5fb6c419f60128f9278d69aa8e28ea33c39d5 Mon Sep 17 00:00:00 2001 From: Itms Date: Wed, 27 Aug 2014 15:25:16 +0000 Subject: [PATCH] Pass map settings also to Scenario games, including in particular trigger scripts for victory conditions. Fixes #2715 This was SVN commit r15688. --- source/ps/Game.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/ps/Game.cpp b/source/ps/Game.cpp index 9f0aedd516..411e29b879 100644 --- a/source/ps/Game.cpp +++ b/source/ps/Game.cpp @@ -166,8 +166,7 @@ void CGame::RegisterInit(const JS::HandleValue attribs, const std::string& saved std::wstring mapFile; m_Simulation2->GetScriptInterface().GetProperty(attribs, "map", mapFile); CScriptValRooted settings; - if (mapType == "skirmish") - m_Simulation2->GetScriptInterface().GetProperty(attribs, "settings", settings); + m_Simulation2->GetScriptInterface().GetProperty(attribs, "settings", settings); m_World->RegisterInit(mapFile, settings, m_PlayerID); }