r6054 - in trunk: data server

[esteel at icculus.org]

Author: esteel
Date: 2009-03-06 05:23:13 -0500 (Fri, 06 Mar 2009)
New Revision: 6054

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/server/server_havoc_linux.sh
   trunk/server/server_havoc_mac.sh
   trunk/server/server_havoc_windows.bat
   trunk/server/server_linux.sh
   trunk/server/server_mac.sh
   trunk/server/server_windows.bat
Log:
make the new server config loading more flexible

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-03-06 09:40:41 UTC (rev 6053)
+++ trunk/data/defaultNexuiz.cfg	2009-03-06 10:23:13 UTC (rev 6054)
@@ -736,7 +736,8 @@
 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

Modified: trunk/server/server_havoc_linux.sh
===================================================================
--- trunk/server/server_havoc_linux.sh	2009-03-06 09:40:41 UTC (rev 6053)
+++ trunk/server/server_havoc_linux.sh	2009-03-06 10:23:13 UTC (rev 6054)
@@ -6,4 +6,4 @@
 esac
 
 cd "`dirname "${0}"`"
-exec ./${executable} -game havoc "${@}"
+exec ./${executable} -game havoc +serverconfig server.cfg "${@}"

Modified: trunk/server/server_havoc_mac.sh
===================================================================
--- trunk/server/server_havoc_mac.sh	2009-03-06 09:40:41 UTC (rev 6053)
+++ trunk/server/server_havoc_mac.sh	2009-03-06 10:23:13 UTC (rev 6054)
@@ -3,4 +3,4 @@
 executable="nexuiz-osx-dedicated"
 
 cd "`dirname "${0}"`"
-exec ./${executable} -game havoc "${@}"
+exec ./${executable} -game havoc +serverconfig server.cfg "${@}"

Modified: trunk/server/server_havoc_windows.bat
===================================================================
--- trunk/server/server_havoc_windows.bat	2009-03-06 09:40:41 UTC (rev 6053)
+++ trunk/server/server_havoc_windows.bat	2009-03-06 10:23:13 UTC (rev 6054)
@@ -5,4 +5,4 @@
 
 %~d0
 cd "%~p0"
-.\%executable% -game havoc %*
+.\%executable% -game havoc +serverconfig server.cfg %*

Modified: trunk/server/server_linux.sh
===================================================================
--- trunk/server/server_linux.sh	2009-03-06 09:40:41 UTC (rev 6053)
+++ trunk/server/server_linux.sh	2009-03-06 10:23:13 UTC (rev 6054)
@@ -6,4 +6,4 @@
 esac
 
 cd "`dirname "${0}"`"
-exec ./${executable} "${@}"
+exec ./${executable} +serverconfig server.cfg "${@}"

Modified: trunk/server/server_mac.sh
===================================================================
--- trunk/server/server_mac.sh	2009-03-06 09:40:41 UTC (rev 6053)
+++ trunk/server/server_mac.sh	2009-03-06 10:23:13 UTC (rev 6054)
@@ -3,4 +3,4 @@
 executable="nexuiz-osx-dedicated"
 
 cd "`dirname "${0}"`"
-exec ./${executable} "${@}"
+exec ./${executable} +serverconfig server.cfg "${@}"

Modified: trunk/server/server_windows.bat
===================================================================
--- trunk/server/server_windows.bat	2009-03-06 09:40:41 UTC (rev 6053)
+++ trunk/server/server_windows.bat	2009-03-06 10:23:13 UTC (rev 6054)
@@ -5,4 +5,4 @@
 
 %~d0
 cd "%~p0"
-.\%executable% %*
+.\%executable% +serverconfig server.cfg %*