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

[DONOTREPLY at icculus.org]

Author: kadaverjack
Date: 2007-04-18 09:09:06 -0400 (Wed, 18 Apr 2007)
New Revision: 2337

Modified:
   branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
   branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
   branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
Log:
merged from trunk: r2327, r2333 & r2335


Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2007-04-18 12:58:38 UTC (rev 2336)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc	2007-04-18 13:09:06 UTC (rev 2337)
@@ -125,12 +125,10 @@
 
 float CL_Weaponentity_CustomizeEntityForClient()
 {
-	if(other == self.owner)
-		self.viewmodelforclient = other;
-	else
-		if(other.classname == "spectator")
-			if(other.enemy == self.owner)
-				self.viewmodelforclient = other;
+	self.viewmodelforclient = self.owner;
+	if(other.classname == "spectator")
+		if(other.enemy == self.owner)
+			self.viewmodelforclient = other;
 	return TRUE;
 }
 

Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-04-18 12:58:38 UTC (rev 2336)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc	2007-04-18 13:09:06 UTC (rev 2337)
@@ -1925,12 +1925,16 @@
 void EndFrame()
 {
 	FOR_EACH_REALCLIENT(self)
+	{
 		if(self.classname == "spectator")
-			self.hitsound += self.enemy.hitsound;
-	FOR_EACH_REALCLIENT(self)
+			self.hitsound = self.enemy.hitsound;
 		if(self.hitsound)
 		{
 			stuffcmd(self, "play2 misc/hit.wav\n");
 			self.hitsound = FALSE;
 		}
+	}
+	FOR_EACH_CLIENT(self)
+			if(clienttype(self) == CLIENTTYPE_BOT)
+				self.hitsound = FALSE;
 }

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc	2007-04-18 12:58:38 UTC (rev 2336)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc	2007-04-18 13:09:06 UTC (rev 2337)
@@ -180,7 +180,7 @@
 void W_Rocket_Attack (void)
 {
 	local entity missile;
-	local entity flash;
+	local entity flash, flash2;
 
 	if (cvar("g_use_ammunition") && !cvar("g_rocketarena"))
 		self.ammo_rockets = self.ammo_rockets - cvar("g_balance_rocketlauncher_ammo");
@@ -221,12 +221,30 @@
 	sound (missile, CHAN_BODY, "weapons/rocket_fly.wav", 0.4, ATTN_NORM);
 	missile.flags = FL_PROJECTILE;
 
+	// muzzle flash for 1st person view
 	flash = spawn ();
-	setorigin (flash, w_shotorg);
+	flash.scale = 1.2;
+	flash.angles_z = 180;
+	flash.owner = self;
+	flash.viewmodelforclient = self;
+	flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
+	setorigin (flash, '35 5 -12');
 	setmodel (flash, "models/flash.md3"); // precision set below
-	flash.angles = vectoangles (w_shotdir);
+	setattachment(flash, self.weaponentity, "bone01");	
 	SUB_SetFade (flash, time, 0.4);
-	flash.effects = flash.effects | EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION;
+
+	// muzzle flash for 3rd person view
+	flash2 = spawn ();
+	flash2.scale = 0.8;
+	flash2.angles_y = 180;
+	flash2.angles_z = 90;
+	setorigin (flash2, '42 0 5');
+	setmodel (flash2, "models/flash.md3"); // precision set below
+	setattachment(flash2, self.exteriorweaponentity, "");	
+	SUB_SetFade (flash2, time, 0.4);
+
+	// common properties
+	flash.effects = flash2.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION;
 }
 
 float(float req) w_rlauncher =

Modified: branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc	2007-04-18 12:58:38 UTC (rev 2336)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc	2007-04-18 13:09:06 UTC (rev 2337)
@@ -27,17 +27,19 @@
 
 	// muzzle flash for 1st person view
 	flash = spawn();
-	setorigin(flash, '53 5 -1');
-	setmodel(flash, "models/uziflash.md3"); flash.effects = EF_LOWPRECISION;
+	setorigin(flash, '53 5 0');
+	setmodel(flash, "models/uziflash.md3"); // precision set below
 	setattachment(flash, self.weaponentity, "bone01");
+	flash.owner = self;
 	flash.viewmodelforclient = self;
+	flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
 	flash.scale = 1.2;
 	SUB_SetFade(flash, time, 0.2);
 
 	// muzzle flash for 3rd person view
 	flash2 = spawn();
-	setorigin(flash2, '51 1 8');
-	setmodel(flash2, "models/uziflash.md3"); flash2.effects = EF_LOWPRECISION;
+	setorigin(flash2, '43 1 8');
+	setmodel(flash2, "models/uziflash.md3"); // precision set below
 	setattachment(flash2, self.exteriorweaponentity, "");
 	SUB_SetFade(flash2, time, 0.2);