[nexuiz-commits] r8362 - in trunk/data: . qcsrc/client qcsrc/server

[DONOTREPLY at icculus.org]

Author: fruitiex
Date: 2009-12-03 12:14:40 -0500 (Thu, 03 Dec 2009)
New Revision: 8362

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/client/sbar.qc
   trunk/data/qcsrc/server/miscfunctions.qc
Log:
-add cvars for playersize to allow eg. defrag mapinfos to set a slightly smaller bbox so the player can fit through places where you have to crouch (still causes prediction errors, so use it only if you really have to!)
-add cvar for adjusting the Y-axis positioning of the race timer


Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-12-02 22:01:15 UTC (rev 8361)
+++ trunk/data/defaultNexuiz.cfg	2009-12-03 17:14:40 UTC (rev 8362)
@@ -323,6 +323,13 @@
 set sv_friction_on_land 0
 exec physics26.cfg
 
+set sv_player_viewoffset "0 0 35" "view offset of the player model"
+set sv_player_mins "-16 -16 -24" "playermodel mins"
+set sv_player_maxs "16 16 45" "playermodel maxs"
+set sv_player_crouch_viewoffset "0 0 15" "view offset of the player model when crouched"
+set sv_player_crouch_mins "-16 -16 -24" "mins of a crouched playermodel"
+set sv_player_crouch_maxs "16 16 25" "maxs of a crouched playermodel"
+
 set sv_pogostick 1 "don't require releasing the space bar for jumping again"
 set sv_doublejump 0 "allow Quake 2-style double jumps"
 
@@ -1577,6 +1584,7 @@
 seta sv_gentle 0	"force gentle mode for everyone, also remove references to acts of killing from the messages"
 seta cl_gentle 0	"client side gentle mode (only replaces gibs); when set to 1, white smoke replaces gibs, when set to 2, colorful clouds replace gibs"
 
+seta cl_racetimer_position 0.25 "Y-axis positioning of the race timer (from 0 to 1)"
 seta cl_showpressedkeys	0	"Show which movement keys someone is pressing: 1 for spectating, 2 for always"
 seta cl_showpressedkeys_position "0.5 0.8"	"1 0 would be upper right corner, 0.5 0.5 the center"
 

Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc	2009-12-02 22:01:15 UTC (rev 8361)
+++ trunk/data/qcsrc/client/sbar.qc	2009-12-03 17:14:40 UTC (rev 8362)
@@ -1641,7 +1641,8 @@
 		vector m;
 		string s, forcetime;
 
-		m = '0.5 0 0' * vid_conwidth + '0 0.25 0' * vid_conheight;
+		float pos;
+		m = '0.5 0 0' * vid_conwidth + '0 1 0' * cvar_or("cl_racetimer_position", 0.25) * vid_conheight;
 
 		if(race_checkpointtime)
 		{

Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc	2009-12-02 22:01:15 UTC (rev 8361)
+++ trunk/data/qcsrc/server/miscfunctions.qc	2009-12-03 17:14:40 UTC (rev 8362)
@@ -218,9 +218,23 @@
     }
 }
 
+vector PL_VIEW_OFS;
+vector PL_MIN;
+vector PL_MAX;
+vector PL_CROUCH_VIEW_OFS;
+vector PL_CROUCH_MIN;
+vector PL_CROUCH_MAX;
+
 float spawnpoint_nag;
 void relocate_spawnpoint()
 {
+    PL_VIEW_OFS                             = stov(cvar_string("sv_player_viewoffset"));
+    PL_MIN                                  = stov(cvar_string("sv_player_mins"));
+    PL_MAX                                  = stov(cvar_string("sv_player_maxs"));
+    PL_CROUCH_VIEW_OFS                      = stov(cvar_string("sv_player_crouch_viewoffset"));
+    PL_CROUCH_MIN                           = stov(cvar_string("sv_player_crouch_mins"));
+    PL_CROUCH_MAX                           = stov(cvar_string("sv_player_crouch_maxs")); 
+
     // nudge off the floor
     setorigin(self, self.origin + '0 0 1');