r2114 - branches/nexuiz-2.0/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-01-14 14:14:50 -0500 (Sun, 14 Jan 2007)
New Revision: 2114

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
   branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
   branches/nexuiz-2.0/data/qcsrc/server/defs.qh
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
Log:
hidden "g_running_guns" mutator; fteqcc bug checking (commented out)


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2007-01-14 19:08:54 UTC (rev 2113)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc	2007-01-14 19:14:50 UTC (rev 2114)
@@ -603,7 +603,7 @@
 
 		CL_SpawnWeaponentity();
 		self.alpha = default_player_alpha;
-		self.exteriorweaponentity.alpha = default_player_alpha;
+		self.exteriorweaponentity.alpha = default_weapon_alpha;
 
 		self.lms_nextcheck = time + cvar("g_lms_campcheck_interval")*2;
 		self.lms_traveled_distance = 0;
@@ -1042,7 +1042,7 @@
 			if (time > self.strength_finished)
 			{
 				self.alpha = default_player_alpha;
-				self.exteriorweaponentity.alpha = default_player_alpha;
+				self.exteriorweaponentity.alpha = default_weapon_alpha;
 				self.items = self.items - (self.items & IT_STRENGTH);
 				sprint(self, "^3Invisibility has worn off\n");
 			}

Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2007-01-14 19:08:54 UTC (rev 2113)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2007-01-14 19:14:50 UTC (rev 2114)
@@ -155,7 +155,10 @@
 		// owner is currently being teleported, so don't apply EF_NODRAW otherwise the viewmodel would "blink"
 		self.effects = self.effects - (self.effects & EF_NODRAW);
 
-	self.alpha = self.owner.alpha;
+	if(self.owner.alpha >= 0)
+		self.alpha = self.owner.alpha;
+	else
+		self.alpha = 1;
 	self.colormap = self.owner.colormap;
 
 	self.angles = '0 0 0';
@@ -201,6 +204,10 @@
 			self.model = "";
 	}
 	self.effects = self.owner.effects;
+	if(self.owner.alpha >= 0)
+		self.alpha = self.owner.alpha;
+	else
+		self.alpha = 1;
 	self.colormap = self.owner.colormap;
 };
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2007-01-14 19:08:54 UTC (rev 2113)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh	2007-01-14 19:14:50 UTC (rev 2114)
@@ -252,6 +252,7 @@
 .float isdecor;
 
 float default_player_alpha;
+float default_weapon_alpha;
 
 .float() customizeentityforclient;
 .float cvar_cl_playerdetailreduction;

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-01-14 19:08:54 UTC (rev 2113)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-01-14 19:14:50 UTC (rev 2114)
@@ -3,18 +3,51 @@
 
 void SetDefaultAlpha()
 {
-	if(cvar("g_cloaked"))
+	if(cvar("g_running_guns"))
 	{
+		default_player_alpha = -1;
+		default_weapon_alpha = +1;
+	}
+	else if(cvar("g_cloaked"))
+	{
 		default_player_alpha = cvar("g_balance_cloaked_alpha");
+		default_weapon_alpha = default_player_alpha;
 	}
 	else
 	{
 		default_player_alpha = cvar("g_player_alpha");
 		if(default_player_alpha <= 0)
 			default_player_alpha = 1;
+		default_weapon_alpha = default_player_alpha;
 	}
 }
 
+void fteqcc_testbugs()
+{
+	float a, b;
+
+	if(!cvar("developer_fteqccbugs"))
+		return;
+
+	dprint("*** fteqcc test: checking for bugs...\n");
+
+	a = 1;
+	b = 5;
+	if(sqrt(a) - sqrt(b - a) == 0)
+		dprint("*** fteqcc test: found same-function-twice bug\n");
+	else
+		dprint("*** fteqcc test: same-function-twice bug got FINALLY FIXED! HOORAY!\n");
+
+	world.frags = -10;
+	world.enemy = world;
+	world.enemy.frags += 10;
+	if(world.frags > 0.2 || world.frags < -0.2) // don't error out if it's just roundoff errors
+		dprint("*** fteqcc test: found += bug\n");
+	else
+		dprint("*** fteqcc test: += bug got FINALLY FIXED! HOORAY!\n");
+	world.frags = 0;
+}
+
 void GotoFirstMap()
 {
 	if(cvar("_sv_init"))
@@ -364,6 +397,8 @@
 
 	if(cvar("g_campaign"))
 		CampaignPostInit();
+
+	// fteqcc_testbugs();
 }
 
 void light (void)