make the new server config loading more flexible
authoresteel <esteel@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 6 Mar 2009 10:23:13 +0000 (10:23 +0000)
committeresteel <esteel@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Fri, 6 Mar 2009 10:23:13 +0000 (10:23 +0000)
git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6054 f962a42d-fe04-0410-a3ab-8c8b0445ebaa

data/defaultNexuiz.cfg
server/server_havoc_linux.sh
server/server_havoc_mac.sh
server/server_havoc_windows.bat
server/server_linux.sh
server/server_mac.sh
server/server_windows.bat

index 2f0e95d..e251a25 100644 (file)
@@ -736,7 +736,8 @@ sv_sound_watersplash ""
 seta cl_hitsound 1
 
 // startmap_dm is used when running with the -listen or -dedicated commandline options
-alias startmap_dm "set _sv_init 0; map _init/_init; exec server.cfg; set _sv_init 1"
+set serverconfig server.cfg
+alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1"
 
 // aliases:
 alias +attack2 +button3
index 9ce82ac..21fef57 100755 (executable)
@@ -6,4 +6,4 @@ case "$(uname -m)" in
 esac
 
 cd "`dirname "${0}"`"
-exec ./${executable} -game havoc "${@}"
+exec ./${executable} -game havoc +serverconfig server.cfg "${@}"
index 9c1819f..89c07a0 100755 (executable)
@@ -3,4 +3,4 @@
 executable="nexuiz-osx-dedicated"
 
 cd "`dirname "${0}"`"
-exec ./${executable} -game havoc "${@}"
+exec ./${executable} -game havoc +serverconfig server.cfg "${@}"
index 3b51ae1..e5368c5 100644 (file)
@@ -5,4 +5,4 @@ set executable=nexuiz -dedicated
 \r
 %~d0\r
 cd "%~p0"\r
-.\%executable% -game havoc %*\r
+.\%executable% -game havoc +serverconfig server.cfg %*\r
index e2dee7a..7d200cb 100755 (executable)
@@ -6,4 +6,4 @@ case "$(uname -m)" in
 esac
 
 cd "`dirname "${0}"`"
-exec ./${executable} "${@}"
+exec ./${executable} +serverconfig server.cfg "${@}"
index c649493..9422841 100755 (executable)
@@ -3,4 +3,4 @@
 executable="nexuiz-osx-dedicated"
 
 cd "`dirname "${0}"`"
-exec ./${executable} "${@}"
+exec ./${executable} +serverconfig server.cfg "${@}"
index f5a1c68..bba5969 100644 (file)
@@ -5,4 +5,4 @@ set executable=nexuiz -dedicated
 \r
 %~d0\r
 cd "%~p0"\r
-.\%executable% %*\r
+.\%executable% +serverconfig server.cfg %*\r