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

[DONOTREPLY at icculus.org]

Author: mrbougo
Date: 2009-06-23 12:22:55 -0400 (Tue, 23 Jun 2009)
New Revision: 7080

Modified:
   trunk/data/defaultNexuiz.cfg
   trunk/data/qcsrc/server/constants.qh
   trunk/data/qcsrc/server/ent_cs.qc
Log:
nexball: little something I forgot to commit: show all players on the radar

Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg	2009-06-23 14:52:41 UTC (rev 7079)
+++ trunk/data/defaultNexuiz.cfg	2009-06-23 16:22:55 UTC (rev 7080)
@@ -24,7 +24,7 @@
 seta g_configversion 0	"Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1  Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
 
 // default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default c8e90e9a68a025f4b3fc2e6a5999baf5
+set cvar_check_default 40e11dd2f984335c9e27adf5beccb2d1
 
 // Nexuiz version (formatted for machines)
 // used to determine if a client version is compatible
@@ -726,6 +726,8 @@
 set g_nexball_football_trail    0  "1 to leave a trail"
 set g_nexball_trail_color     254  "1-256 for different colors (Quake palette, 254 is white)"
 
+set g_nexball_radar_showallplayers 1  "1: show every player and the ball on the radar  0: only show teammates and the ball on the radar"
+
 // server game balance settings
 set g_balance_armor_regen 0
 set g_balance_armor_rot 0.1

Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh	2009-06-23 14:52:41 UTC (rev 7079)
+++ trunk/data/qcsrc/server/constants.qh	2009-06-23 16:22:55 UTC (rev 7080)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "c8e90e9a68a025f4b3fc2e6a5999baf5";
+string CVAR_CHECK_DEFAULT = "40e11dd2f984335c9e27adf5beccb2d1";
 string CVAR_CHECK_WEAPONS = "4f7b4c1e2feeef4988b02a93ff35a2ca";
 
 float	FALSE					= 0;

Modified: trunk/data/qcsrc/server/ent_cs.qc
===================================================================
--- trunk/data/qcsrc/server/ent_cs.qc	2009-06-23 14:52:41 UTC (rev 7079)
+++ trunk/data/qcsrc/server/ent_cs.qc	2009-06-23 16:22:55 UTC (rev 7080)
@@ -32,7 +32,7 @@
 		return FALSE;
 	if(other.classname == "player")
 		if(o.team != other.team)
-			if(!sv_cheats)
+			if not (sv_cheats || (g_nexball && cvar("g_nexball_radar_showallplayers")))
 				return FALSE;
 	return TRUE;
 }