r3754 - in branches/nexuiz-2.0: . data data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-07-02 05:52:25 -0400 (Wed, 02 Jul 2008)
New Revision: 3754

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/defaultNexuiz.cfg
   branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
   branches/nexuiz-2.0/data/qcsrc/server/defs.qh
   branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
   branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
Log:
r3744 | div0 | 2008-06-30 10:30:29 +0200 (Mon, 30 Jun 2008) | 2 lines
fix the hook alias
r3745 | div0 | 2008-06-30 10:38:11 +0200 (Mon, 30 Jun 2008) | 2 lines
sv_maxidle_spectatorsareidle

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-07-02 09:47:14 UTC (rev 3753)
+++ branches/nexuiz-2.0/.patchsets	2008-07-02 09:52:25 UTC (rev 3754)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3730,3733-3742
+revisions_applied = 1-3745

Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg	2008-07-02 09:47:14 UTC (rev 3753)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg	2008-07-02 09:52:25 UTC (rev 3754)
@@ -1032,3 +1032,5 @@
 
 // maxidle (in seconds): kick players idle for more than that amount of time
 set sv_maxidle 0
+// when sv_maxidle is not 0, assume spectators are idle too
+set sv_maxidle_spectatorsareidle 0

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc	2008-07-02 09:47:14 UTC (rev 3753)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc	2008-07-02 09:52:25 UTC (rev 3754)
@@ -122,16 +122,13 @@
 	string temps;
 
 	buttons = self.BUTTON_ATCK + 2 * self.BUTTON_JUMP + 4 * self.BUTTON_ATCK2 + 8 * self.BUTTON_ZOOM + 16 * self.BUTTON_CROUCH + 32 * self.BUTTON_HOOK + 64 * self.BUTTON_USE;
-	if(buttons != self.buttons_old)
-		self.parm_idlesince = time;
+	if(!sv_maxidle_spectatorsareidle || self.movetype == MOVETYPE_WALK)
+	{
+		if(buttons != self.buttons_old || self.movement != self.movement_old || self.v_angle != self.v_angle_old)
+			self.parm_idlesince = time;
+	}
 	self.buttons_old = buttons;
-
-	if(self.movement != self.movement_old)
-		self.parm_idlesince = time;
 	self.movement_old = self.movement;
-
-	if(self.v_angle != self.v_angle_old)
-		self.parm_idlesince = time;
 	self.v_angle_old = self.v_angle;
 
 	if(time > self.shtest_next)

Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2008-07-02 09:47:14 UTC (rev 3753)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2008-07-02 09:52:25 UTC (rev 3754)
@@ -445,3 +445,4 @@
 
 .float parm_idlesince;
 float sv_maxidle;
+float sv_maxidle_spectatorsareidle;

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2008-07-02 09:47:14 UTC (rev 3753)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc	2008-07-02 09:52:25 UTC (rev 3754)
@@ -292,6 +292,6 @@
 {
 	// this function has been modified for Nexuiz
 	// don't remove these lines! old server or demos coud overwrite the new aliases
-	stuffcmd(self, "alias +hook +BUTTON_HOOK\n");
-	stuffcmd(self, "alias -hook -BUTTON_HOOK\n");
+	stuffcmd(self, "alias +hook +button6\n");
+	stuffcmd(self, "alias -hook -button6\n");
 }

Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2008-07-02 09:47:14 UTC (rev 3753)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc	2008-07-02 09:52:25 UTC (rev 3754)
@@ -768,6 +768,7 @@
 	g_vampire = cvar("g_vampire");
 	g_tourney = cvar("g_tourney");
 	sv_maxidle = cvar("sv_maxidle");
+	sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
 
 	g_pickup_shells                    = cvar("g_pickup_shells");
 	g_pickup_shells_max                = cvar("g_pickup_shells_max");