From b85f1e95550c8986922267ac8d5b9358b3d829c1 Mon Sep 17 00:00:00 2001
From: Curtis Shmyr <cjshmyr@gmail.com>
Date: Sun, 12 Jun 2016 13:10:14 -0600
Subject: [PATCH] Make launch-dedicated scripts consistent between platforms

---
 launch-dedicated.cmd | 11 ++++++-----
 launch-dedicated.sh  |  5 ++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/launch-dedicated.cmd b/launch-dedicated.cmd
index 0cb9d32e1b..9076aaaf46 100644
--- a/launch-dedicated.cmd
+++ b/launch-dedicated.cmd
@@ -1,17 +1,18 @@
+:: example launch script, see https://github.com/OpenRA/OpenRA/wiki/Dedicated for details
+
 @echo on
 
 set Name="Dedicated Server"
 set Mod=ra
-set Dedicated=True
-set DedicatedLoop=True
 set ListenPort=1234
 set ExternalPort=1234
 set AdvertiseOnline=True
-set Map=
-set Password=
+set AllowPortForward=False
+set DisableSinglePlayer=True
+set Password=""
 
 :loop
 
-OpenRA.Game.exe Game.Mod=%Mod% Server.Dedicated=%Dedicated% Server.DedicatedLoop=%DedicatedLoop% Server.Name=%Name% Server.ListenPort=%ListenPort% Server.ExternalPort=%ExternalPort% Server.AdvertiseOnline=%AdvertiseOnline% Server.Map=%Map% Server.Password=%Password% 
+OpenRA.Server.exe Game.Mod=%Mod% Server.Name=%Name% Server.ListenPort=%ListenPort% Server.ExternalPort=%ExternalPort% Server.AdvertiseOnline=%AdvertiseOnline% Server.AllowPortForward=%AllowPortForward% Server.DisableSinglePlayer=%DisableSinglePlayer% Server.Password=%Password%
 
 goto loop
\ No newline at end of file
diff --git a/launch-dedicated.sh b/launch-dedicated.sh
index 747b651f25..fed4628e21 100755
--- a/launch-dedicated.sh
+++ b/launch-dedicated.sh
@@ -12,9 +12,12 @@ ListenPort="${ListenPort:-"1234"}"
 ExternalPort="${ExternalPort:-"1234"}"
 AdvertiseOnline="${AdvertiseOnline:-"True"}"
 AllowPortForward="${AllowPortForward:-"False"}"
+DisableSinglePlayer="${DisableSinglePlayer:-"True"}"
+Password="${Password:-""}"
 
 while true; do
      mono --debug OpenRA.Server.exe Game.Mod=$Mod \
      Server.Name="$Name" Server.ListenPort=$ListenPort Server.ExternalPort=$ExternalPort \
-     Server.AdvertiseOnline=$AdvertiseOnline Server.AllowPortForward=$AllowPortForward
+     Server.AdvertiseOnline=$AdvertiseOnline Server.AllowPortForward=$AllowPortForward \
+     Server.DisableSinglePlayer=$DisableSinglePlayer Server.Password=$Password
 done