Allow starting demos through a script

Author: ashdnazg

rts/Game/ClientSetup.cpp

@@ -72,4 +72,5 @@ void ClientSetup::LoadFromStartScript(const std::string& setup)
 	}
 
 	file.GetDef(saveFile, "", "GAME\\SaveFile");
+	file.GetDef(demoFile, "", "GAME\\DemoFile");
 }

rts/Game/ClientSetup.h

@@ -17,6 +17,7 @@ class ClientSetup
 	std::string myPlayerName;
 	std::string myPasswd;
 	std::string saveFile;
+	std::string demoFile;
 
 	//! if this client is not the server player, the IP address we connect to
 	//! if this client is the server player, the IP address that other players connect to

rts/System/SpringApp.cpp

@@ -694,10 +694,29 @@ CGameController* SpringApp::LoadSaveFile(const std::string& saveFile)
 }
 
 
+CGameController* SpringApp::LoadDemoFile(const std::string& demoFile)
+{
+	const std::string ext = FileSystem::GetExtension(demoFile);
+
+	if (ext != "sdfz")
+		throw content_error(std::string("Unknown demo extension: ") + ext);
+
+	clientSetup->isHost        = true;
+	clientSetup->myPlayerName += " (spec)";
+
+	pregame = new CPreGame(clientSetup);
+	pregame->LoadDemo(demoFile);
+	return pregame;
+}
+
+
 CGameController* SpringApp::RunScript(const std::string& buf)
 {
 	clientSetup->LoadFromStartScript(buf);
 
+	if (!clientSetup->demoFile.empty())
+		return LoadDemoFile(clientSetup->demoFile);
+
 	if (!clientSetup->saveFile.empty())
 		return LoadSaveFile(clientSetup->saveFile);
 
@@ -798,13 +817,8 @@ void SpringApp::Startup()
 
 		clientSetup->isHost = false;
 		pregame = new CPreGame(clientSetup);
-	} else if (inputFile.rfind(".sdfz") != std::string::npos) {
-		// demo.sdfz
-		clientSetup->isHost        = true;
-		clientSetup->myPlayerName += " (spec)";
-
-		pregame = new CPreGame(clientSetup);
-		pregame->LoadDemo(inputFile);
+	} else if (extension == "sdfz") {
+		LoadDemoFile(inputFile);
 	} else if (extension == "slsf" || extension == "ssf") {
 		LoadSaveFile(inputFile);
 	} else {

rts/System/SpringApp.h

@@ -62,6 +62,7 @@ class SpringApp
 
 	CGameController* RunScript(const std::string& buf);
 	CGameController* LoadSaveFile(const std::string& saveName); //!< Starts game from a specified save
+	CGameController* LoadDemoFile(const std::string& demoName); //!< Starts game from a specified save
 };
 
 /**