r3407 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-02-23 14:41:28 -0500 (Sat, 23 Feb 2008)
New Revision: 3407

Modified:
   trunk/data/default.cfg
   trunk/data/qcsrc/server/clientcommands.qc
   trunk/data/qcsrc/server/g_world.qc
Log:
remove some unnecessary cvars


Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2008-02-23 19:40:18 UTC (rev 3406)
+++ trunk/data/default.cfg	2008-02-23 19:41:28 UTC (rev 3407)
@@ -629,8 +629,6 @@
 // which quotient of the players constitute a majority? (try: 0.667, 0.75 when using the above)
 set sv_vote_majority_factor 0.5
 // when disabled, don't allow game type changes
-set sv_vote_change_gametype 0
-// when enabled, votes may override the most recent map list and change to such a map anyway
 set sv_vote_override_mostrecent 0
 alias vhelp "cmd vote help"
 alias vstatus "cmd vote status"
@@ -742,7 +740,6 @@
 seta g_maplist_votable_keeptwotime 15
 seta g_maplist_votable_timeout 30 // note: must be below 50 seconds!
 seta g_maplist_votable_suggestions 2
-seta g_maplist_votable_suggestions_change_gametype 0
 seta g_maplist_votable_suggestions_override_mostrecent 0
 seta g_maplist_votable_nodetail 0 // nodetail only shows total count instead of all vote counts per map, so votes don't influence others that much
 seta g_maplist_votable_abstain 0 // when 1, you can abstain from your vote

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2008-02-23 19:40:18 UTC (rev 3406)
+++ trunk/data/qcsrc/server/clientcommands.qc	2008-02-23 19:41:28 UTC (rev 3407)
@@ -575,13 +575,14 @@
 		sprint(self, "This map is not available on this server.\n");
 		return string_null;
 	}
-#endif
+#else
 	if(!cvar("sv_vote_change_gametype"))
 		if(!IsSameGametype(m))
 		{
 			sprint(self, "This server does not allow changing the game type by map votes.\n");
 			return string_null;
 		}
+#endif
 	if(!cvar("sv_vote_override_mostrecent"))
 		if(Map_IsRecent(m))
 		{

Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc	2008-02-23 19:40:18 UTC (rev 3406)
+++ trunk/data/qcsrc/server/g_world.qc	2008-02-23 19:41:28 UTC (rev 3407)
@@ -1789,10 +1789,11 @@
 	m = MapInfo_FixName(m);
 	if(!m)
 		return "The map you suggested is not available on this server.";
-#endif
+#else
 	if(!cvar("g_maplist_votable_suggestions_change_gametype"))
 		if(!IsSameGametype(m))
 			return "This server does not allow changing the game type by map suggestions.";
+#endif
 	if(!cvar("g_maplist_votable_override_mostrecent"))
 		if(Map_IsRecent(m))
 			return "This server does not allow for recent maps to be played again. Please be patient for some rounds.";