r2637 - in branches/nexuiz-2.0: Docs/server data data/menu/creategame data/menu/data

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sun May 20 16:44:25 EDT 2007


Author: div0
Date: 2007-05-20 16:44:25 -0400 (Sun, 20 May 2007)
New Revision: 2637

Modified:
   branches/nexuiz-2.0/Docs/server/server.cfg
   branches/nexuiz-2.0/data/default.cfg
   branches/nexuiz-2.0/data/menu/creategame/maplist.menu
   branches/nexuiz-2.0/data/menu/data/effects.menu
   branches/nexuiz-2.0/data/menu/data/server.menu
Log:
menu items for map list votable/random; dlight shadows now work with rtworld disabled


Modified: branches/nexuiz-2.0/Docs/server/server.cfg
===================================================================
--- branches/nexuiz-2.0/Docs/server/server.cfg	2007-05-20 20:43:45 UTC (rev 2636)
+++ branches/nexuiz-2.0/Docs/server/server.cfg	2007-05-20 20:44:25 UTC (rev 2637)
@@ -20,7 +20,7 @@
 
 //g_maplist_votable 5 // number of maps to vote between; set to 0 to disable the map voting screen (please enable g_maplist_shuffle above when this is enabled, or votes will be repetitive)
 //g_maplist_votable_suggestions 2 // number of suggestions to accept using the suggestmap command
-//g_maplist_votable_suggestions_change_gametype 1 // 0 will forbid suggestmap to change the game type
+//g_maplist_votable_suggestions_change_gametype 0 // 1 will allow suggestmap to change the game type (enable this on multi-gamemode servers)
 
 //maxplayers 8 // number of players allowed on the server
 //port 26000 // the port used by the server
@@ -48,7 +48,7 @@
 //sv_vote_master 1 // 0 will disable voting to become masters
 //sv_vote_master_password "" // when set, vdo login master will allow you to run votable commands directly using vdo
 //sv_vote_simple_majority 0 // 1 will make votes succeed if there are more yes than no votes; with 0 (default), more than half of the players have to say yes
-//sv_vote_change_gametype 1 // 0 will forbid changing the game type by map votes
+//sv_vote_change_gametype 0 // 1 will allow changing the game type by map votes (enable this on multi-gamemode servers)
 
 //sv_defaultcharacter 0 // 1 will force a specific model for all players
 //sv_defaultplayermodel models/player/nexus.zym // this model will be used

Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg	2007-05-20 20:43:45 UTC (rev 2636)
+++ branches/nexuiz-2.0/data/default.cfg	2007-05-20 20:44:25 UTC (rev 2637)
@@ -567,7 +567,7 @@
 // a simple majority suffices to accept a vote (meaning: YES votes > NO votes, otherwise: YES votes > half of the players)
 set sv_vote_simple_majority 0
 // when disabled, don't allow game type changes
-set sv_vote_change_gametype 1
+set sv_vote_change_gametype 0
 alias vhelp "cmd vote help"
 alias vstatus "cmd vote status"
 alias vcall "cmd vote call $*"
@@ -674,11 +674,11 @@
 //   3: absolute velocity + player velocity component in shot direction (note: does NOT yield the right relative velocity, but may be good enough, but it is somewhat prone to sniper rockets)
 //   4: just add the player velocity length to the absolute velocity (tZork's sniper rockets)
 
-set g_maplist_votable 5
-set g_maplist_votable_keeptwotime 15
-set g_maplist_votable_timeout 30 // note: must be below 50 seconds!
-set g_maplist_votable_suggestions 2
-set g_maplist_votable_suggestions_change_gametype 1
+seta g_maplist_votable 5
+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
 alias suggestmap "cmd suggestmap $1"
 
 set g_chat_flood_spl 0                   // seconds between lines to not count as flooding
@@ -749,3 +749,6 @@
 
 // so it can be stuffcmd-ed still
 set cl_gravity 800 // but ignored anyway
+
+// to set both cvars at once (for the menu)
+alias _r_shadow_rwds_and_rds "r_shadow_realtime_world_dlightshadows $1 ; r_shadow_realtime_dlight_shadows $1"

Modified: branches/nexuiz-2.0/data/menu/creategame/maplist.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/creategame/maplist.menu	2007-05-20 20:43:45 UTC (rev 2636)
+++ branches/nexuiz-2.0/data/menu/creategame/maplist.menu	2007-05-20 20:44:25 UTC (rev 2637)
@@ -21,10 +21,24 @@
 	Derive Nex_Option_MapType MapQuery
 	{
 		pos	'0 0'
-		size	'900 20'
+		size	'380 20'
 		text	"Map Type:"
 		target	"Data::Server::Map::Query::Switch"
 	}
+	Derive Nex_Option_MapType Votable
+	{
+		pos	'380 0'
+		size	'260 20'
+		text	"Voting:"
+		target	"Data::Server::Map::Votable::Switch"
+	}
+	Derive Nex_Option_MapType Random
+	{
+		pos	'640 0'
+		size	'200 20'
+		text	"Selection:"
+		target	"Data::Server::Map::Random::Switch"
+	}
 	Derive Label MapsLabel
 	{
 		pos	'0 20'

Modified: branches/nexuiz-2.0/data/menu/data/effects.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/data/effects.menu	2007-05-20 20:43:45 UTC (rev 2636)
+++ branches/nexuiz-2.0/data/menu/data/effects.menu	2007-05-20 20:44:25 UTC (rev 2637)
@@ -84,9 +84,10 @@
 
 		[DataLink_OnOffSwitch]
 	}
-	Item Data_Cvar RealtimeDLightShadows
+	Item Data_ServerCvar RealtimeDLightShadows
 	{
 		cvarName	"r_shadow_realtime_world_dlightshadows"
+		syncCmd     "_r_shadow_rwds_and_rds"
 		defValue	0
 
 		[DataLink_OnOffSwitch]

Modified: branches/nexuiz-2.0/data/menu/data/server.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/data/server.menu	2007-05-20 20:43:45 UTC (rev 2636)
+++ branches/nexuiz-2.0/data/menu/data/server.menu	2007-05-20 20:44:25 UTC (rev 2637)
@@ -37,6 +37,34 @@
 			// creates x and x_index (CVAR_SAVE)
 			cvarName	"g_maplist"
 		}
+
+		Item Data_CvarCreateSave Random
+		{
+			cvarName	"g_maplist_shuffle"
+			defValue	1
+
+			Item DataLink_ValueSwitch Switch
+			{
+				minValue	0
+				stepValue	1
+				maxValue	1
+				descList	"'Linear''Random'"
+				link		"##up"
+			}
+		}
+
+		Item Data_CvarCreateSave Votable
+		{
+			cvarName	"g_maplist_votable"
+			defValue	5
+
+			Item DataLink_ValueSwitch Switch
+			{
+				valueList   "'0''3''4''5'"
+				descList	"'none''3 maps''4 maps''5 maps'"
+				link		"##up"
+			}
+		}
 	}
 
 	Item Data_Cvar Hostname




More information about the nexuiz-commits mailing list