Added option to use Spring.Restart instead of Spring.Start.

LuaUI/widgets/chobby/components/configuration.lua

@@ -60,6 +60,7 @@ function Configuration:init()
 	self.notifyForAllChat = true
 	self.debugMode = false
 	self.onlyShowFeaturedMaps = true
+	self.useSpringRestart = false
 
 	self.font = {
 		[0] = {size = 10, shadow = false},
@@ -103,6 +104,8 @@ function Configuration:GetConfigData()
 		confirmation_mainMenuFromBattle = self.confirmation_mainMenuFromBattle,
 		confirmation_battleFromBattle = self.confirmation_battleFromBattle,
 		loadLocalWidgets = self.loadLocalWidgets,
+		onlyShowFeaturedMaps = self.onlyShowFeaturedMaps,
+		useSpringRestart = self.useSpringRestart,
 	}
 end
 
@@ -115,6 +118,9 @@ function Configuration:SetConfigValue(key, value)
 		return
 	end
 	self[key] = value
+	if key == "useSpringRestart" then
+		lobby.useSpringRestart = value
+	end
 	self:_CallListeners("OnConfigurationChange", key, value)
 end
 

LuaUI/widgets/gui_battle_room_window.lua

@@ -168,7 +168,7 @@ local function SetupInfoButtonsPanel(leftInfo, rightInfo, battle, battleID, myUs
 					if battle.isRunning then
 						battleLobby:ConnectToBattle()
 					else
-						battleLobby:StartBattle()
+						battleLobby:StartBattle(WG.Chobby.Configuration.useSpringRestart)
 					end
 				else
 					Spring.Echo("Do something if map or game is missing")

LuaUI/widgets/gui_settings_window.lua

@@ -227,6 +227,23 @@ local function InitializeControls(window)
 	}
 	offset = offset + 30
 
+	local useSpringRestart = Checkbox:New {
+		x = 60,
+		width = 200,
+		y = offset,
+		height = 40,
+		parent = window,
+		boxalign = "right",
+		boxsize = 20,
+		caption = "Use Spring.Restart            EXPERIMENTAL",
+		checked = Configuration.useSpringRestart or false,
+		font = Configuration:GetFont(2),
+		OnChange = {function (obj, newState)
+			Configuration:SetConfigValue("useSpringRestart", newState)
+		end},
+	}
+	offset = offset + 30
+
 	------------------------------------------------------------------
 	-- Ingame
 	------------------------------------------------------------------

libs/liblobby/lobby/interface_skirmish.lua

@@ -30,7 +30,7 @@ local function ScriptTXT(script)
 	return string
 end
 
-function InterfaceSkirmish:_StartScript(gameName, mapName, playerName)
+function InterfaceSkirmish:_StartScript(gameName, mapName, playerName, useSpringRestart)
 	local allyTeams = {}
 	local allyTeamCount = 0
 	local teams = {}
@@ -116,16 +116,20 @@ function InterfaceSkirmish:_StartScript(gameName, mapName, playerName)
 	local scriptTxt = ScriptTXT(script)
 	scriptFile:write(scriptTxt)
 	scriptFile:close()
-	Spring.Start(scriptFileName, "")
+	if useSpringRestart then
+		Spring.Restart(scriptFileName, "")
+	else
+		Spring.Start(scriptFileName, "")
+	end
 end
 
 -- TODO: Needs clean implementation in lobby.lua
-function InterfaceSkirmish:StartBattle()
+function InterfaceSkirmish:StartBattle(useSpringRestart)
 	local battle = self:GetBattle(self:GetMyBattleID())
 	if battle.gameName and battle.mapName then
 		self:_CallListeners("OnBattleAboutToStart")
 		self:_OnSaidBattleEx("Battle", "about to start")
-		self:_StartScript(battle.gameName, battle.mapName, self:GetMyUserName() or "noname")
+		self:_StartScript(battle.gameName, battle.mapName, self:GetMyUserName() or "noname", useSpringRestart)
 	end
 	return self
 end

libs/liblobby/lobby/lobby.lua

@@ -151,7 +151,7 @@ function Lobby:SayBattleEx(message)
 	return self
 end
 
-function Lobby:ConnectToBattle()
+function Lobby:ConnectToBattle(useSpringRestart)
 	if not self.myBattleID then
 		Spring.Echo("Cannot connect to battle.")
 		return
@@ -162,7 +162,11 @@ function Lobby:ConnectToBattle()
 	local battle = self:GetBattle(self.myBattleID)
 	local springURL = "spring://" .. self:GetMyUserName() .. ":" .. self:GetScriptPassword() .. "@" .. battle.ip .. ":" .. battle.port
 	Spring.Echo(springURL)
-	Spring.Start(springURL, "")
+	if useSpringRestart then
+		Spring.Restart(springURL, "")
+	else
+		Spring.Start(springURL, "")
+	end
 	--local scriptFileName = "scriptFile.txt"
 	--local scriptFile = io.open(scriptFileName, "w")
 	--local scriptTxt = GenerateScriptTxt(battleID)
@@ -310,7 +314,7 @@ function Lobby:_OnUpdateUserStatus(userName, status)
 		if self.myBattleID and status.isInGame then
 			local myBattle = self:GetBattle(self.myBattleID)
 			if myBattle and myBattle.founder == userName then
-				self:ConnectToBattle()
+				self:ConnectToBattle(self.useSpringRestart)
 			end
 		end
 	end