r2305 - in trunk/data: . menu/data menu/options qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-04-13 18:50:26 -0400 (Fri, 13 Apr 2007)
New Revision: 2305

Modified:
   trunk/data/default.cfg
   trunk/data/menu/data/player.menu
   trunk/data/menu/options/player.menu
   trunk/data/qcsrc/server/cl_client.qc
   trunk/data/qcsrc/server/clientcommands.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
menu changes to autoswitch/shownames/showgibs now take effect immediately; use
sendcvar (old unused DP feature) instead of reportcvar; add hidewaypoints and
zoomfactor menu options


Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg	2007-04-13 22:31:29 UTC (rev 2304)
+++ trunk/data/default.cfg	2007-04-13 22:50:26 UTC (rev 2305)
@@ -1,3 +1,7 @@
+// changes a cvar and reports it to the server (for the menu to notify the
+// server about changes)
+alias setreport "set $1 $2 ; sendcvar $1"
+
 // Nexuiz version (formatted for humans)
 set g_nexuizversion 2.2svn
 

Modified: trunk/data/menu/data/player.menu
===================================================================
--- trunk/data/menu/data/player.menu	2007-04-13 22:31:29 UTC (rev 2304)
+++ trunk/data/menu/data/player.menu	2007-04-13 22:50:26 UTC (rev 2305)
@@ -64,6 +64,20 @@
 			link		"##up"
 		}
 	}
+	Item Data_ServerCvar ZoomFactor
+	{
+		cvarName	"cl_zoomfactor"
+		syncCmd     "setreport cl_zoomfactor"
+		defValue	"5"
+
+		Item DataLink_Value Value
+		{
+			minValue	1.5
+			maxValue	8.0
+			stepValue	0.5
+			link		"##up"
+		}
+	}
 	Item Data_Cvar ViewSize
 	{
 		cvarName	"viewsize"
@@ -77,23 +91,26 @@
 			link		"##up"
 		}
 	}
-	Item Data_Cvar WeaponAutoswitch
+	Item Data_ServerCvar WeaponAutoswitch
 	{
 		cvarName	"cl_autoswitch"
+		syncCmd     "setreport cl_autoswitch"
 		defValue	1
 
 		[DataLink_OnOffSwitch]
 	}
-	Item Data_Cvar NoGibs
+	Item Data_ServerCvar NoGibs
 	{
 		cvarName	"cl_nogibs"
+		syncCmd     "setreport cl_nogibs"
 		defValue	"0"
 	
 		[DataLink_OnOffSwitch]
 	}
-	Item Data_Cvar PlayerShowNames
+	Item Data_ServerCvar PlayerShowNames
 	{
 		cvarName "cl_shownames"
+		syncCmd  "setreport cl_shownames"
 		defValue "1"
 		
 		Item DataLink_TextSwitch Switch
@@ -103,6 +120,19 @@
 			link  "##up"
 		}
 	}
+	Item Data_ServerCvar ShowWaypoints
+	{
+		cvarName "cl_hidewaypoints"
+		syncCmd  "setreport cl_hidewaypoints"
+		defValue "0"
+		
+		Item DataLink_TextSwitch Switch
+		{
+			valueList "'0' '1'"
+			descList "'Display' 'Hide'"
+			link  "##up"
+		}
+	}
 	Item DataContainer Crosshair
 	{
 		Item Data_Cvar Type

Modified: trunk/data/menu/options/player.menu
===================================================================
--- trunk/data/menu/options/player.menu	2007-04-13 22:31:29 UTC (rev 2304)
+++ trunk/data/menu/options/player.menu	2007-04-13 22:50:26 UTC (rev 2305)
@@ -142,6 +142,11 @@
 			text	"Field of View"
 			target	"::Data::Player::FOV::Value"
 		}
+		Derive Nex_Option_Slider ZoomFactor
+		{
+			text	"Zoom factor"
+			target	"::Data::Player::ZoomFactor::Value"
+		}
 		Derive Nex_Option_Slider ViewSize
 		{
 			text	"View Size"
@@ -192,6 +197,11 @@
 			text    "Show player names"
 			target  "::Data::Player::PlayerShowNames::Switch"
 		}		
+		Derive Nex_Option_Switch ShowWaypoints
+		{
+			text    "Map waypoints"
+			target  "::Data::Player::ShowWaypoints::Switch"
+		}		
 		Derive Nex_Option_Slider MapDLSpeed
 		{
 			text	"Download Speed"

Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc	2007-04-13 22:31:29 UTC (rev 2304)
+++ trunk/data/qcsrc/server/cl_client.qc	2007-04-13 22:50:26 UTC (rev 2305)
@@ -754,9 +754,8 @@
 	// Wazat's grappling hook
 	SetGrappleHookBindings();
 
-	// get autoswitch state from player
-	stuffcmd(self, "alias autoswitch \"set cl_autoswitch $1; cmd autoswitch $1\"\n");
-	stuffcmd(self, "cmd autoswitch $cl_autoswitch\n");
+	// get autoswitch state from player when he toggles it
+	stuffcmd(self, "alias autoswitch \"set cl_autoswitch $1 ; cmd autoswitch $1\"\n");
 
 	// get version info from player
 	stuffcmd(self, "cmd clientversion $gameversion\n");

Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc	2007-04-13 22:31:29 UTC (rev 2304)
+++ trunk/data/qcsrc/server/clientcommands.qc	2007-04-13 22:50:26 UTC (rev 2305)
@@ -309,8 +309,10 @@
 			self.classname = "observer";
 			stuffcmd(self,"menu_showteamselect\n");
 		}
-	} else if(argv(0) == "reportcvar") {
+	} else if(argv(0) == "reportcvar") { // old system
 		GetCvars(1);
+	} else if(argv(0) == "sentcvar") { // new system
+		GetCvars(1);
 	} else if(argv(0) == "spectate") {
 		if(cvar("g_lms") || cvar("g_arena"))
 			return; // don't allow spectating in lms, unless player runs out of lives

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2007-04-13 22:31:29 UTC (rev 2304)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2007-04-13 22:50:26 UTC (rev 2305)
@@ -341,7 +341,7 @@
 		}
 	}
 	else
-		stuffcmd(self, strcat("cmd reportcvar ", name, " $", name, "\n"));
+		stuffcmd(self, strcat("sendcvar ", name, "\n"));
 }
 void GetCvars_handleFloat(float f, .float field, string name)
 {
@@ -354,10 +354,11 @@
 			self.field = stof(argv(f + 1));
 	}
 	else
-		stuffcmd(self, strcat("cmd reportcvar ", name, " $", name, "\n"));
+		stuffcmd(self, strcat("sendcvar ", name, "\n"));
 }
 void GetCvars(float f)
 {
+	GetCvars_handleFloat(f, autoswitch, "cl_autoswitch");
 	GetCvars_handleFloat(f, cvar_cl_hidewaypoints, "cl_hidewaypoints");
 	GetCvars_handleFloat(f, cvar_cl_zoomfactor, "cl_zoomfactor");
 	GetCvars_handleFloat(f, cvar_cl_zoomspeed, "cl_zoomspeed");