r6097 - in trunk: data server

[esteel at icculus.org]

Author: esteel
Date: 2009-03-10 02:58:10 -0400 (Tue, 10 Mar 2009)
New Revision: 6097

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/server/server.cfg
Log:
last checking works, so use gametype in server.cfg
add aliases sv_loadconfig and addvote

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-03-10 06:39:43 UTC (rev 6096)
+++ trunk/data/defaultNexuiz.cfg	2009-03-10 06:58:10 UTC (rev 6097)
@@ -738,6 +738,7 @@
 // startmap_dm is used when running with the -listen or -dedicated commandline options
 set serverconfig server.cfg
 alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1; map _init/_init"
+alias sv_loadconfig "exec $serverconfig"
 
 // aliases:
 alias +attack2 +button3
@@ -1051,6 +1052,7 @@
 alias gametype	"sv_cmd gametype $*"
 
 alias addfav "qc_cmd addtolist net_slist_favorites $*"
+alias addvote "qc_cmd addvote sv_vote_commands $*"
 
 // key hunt
 set g_keyhunt 0

Modified: trunk/server/server.cfg
===================================================================
--- trunk/server/server.cfg	2009-03-10 06:39:43 UTC (rev 6096)
+++ trunk/server/server.cfg	2009-03-10 06:58:10 UTC (rev 6097)
@@ -38,17 +38,11 @@
 // TEAMS for key hunt (change this to 2, 3, 4 to set a fixed keyhunt style)
 //g_keyhunt_teams_override -1  // teams for KH
 
-// GAME MODE: what type of server do you want to host? Only uncomment ONE of these.
-//g_dm 1          // deathmatch
-//g_tdm 1         // team deathmatch
-//g_ctf 1         // capture the flag
-//g_domination 1  // domination
-//g_runematch 1   // runematch
-//g_lms 1         // last man standing
-//g_arena 1       // arena
-//g_keyhunt 1     // key hunt
-//g_race 1        // Race
+// GAME MODE: what type of server do you want to host?
+// possible values: dm (deathmatch), tdm (team deathmatch), dom (domination), ctf (ctf), rune (runematch), lms (last man standing), arena (arena), kh (keyhunt), as (assault), ons (onslaught), race (race)
+//gametype dm
 
+
 // enable some mutators you'd like
 //g_cloaked 0              // set to 1 for transparent hard to see players
 //g_footsteps 0            // set to 1 to enable footsteps