r5610 - in trunk/data/qcsrc: client server

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Mon Jan 19 02:36:12 EST 2009


Author: div0
Date: 2009-01-19 02:36:12 -0500 (Mon, 19 Jan 2009)
New Revision: 5610

Modified:
   trunk/data/qcsrc/client/damage.qc
   trunk/data/qcsrc/client/projectile.qc
   trunk/data/qcsrc/server/w_campingrifle.qc
   trunk/data/qcsrc/server/w_common.qc
   trunk/data/qcsrc/server/w_crylink.qc
   trunk/data/qcsrc/server/w_grenadelauncher.qc
   trunk/data/qcsrc/server/w_hagar.qc
   trunk/data/qcsrc/server/w_hlac.qc
   trunk/data/qcsrc/server/w_hook.qc
   trunk/data/qcsrc/server/w_laser.qc
   trunk/data/qcsrc/server/w_minstanex.qc
   trunk/data/qcsrc/server/w_nex.qc
   trunk/data/qcsrc/server/w_porto.qc
   trunk/data/qcsrc/server/w_seeker.qc
   trunk/data/qcsrc/server/w_shotgun.qc
   trunk/data/qcsrc/server/w_uzi.qc
Log:
fix the other precaches


Modified: trunk/data/qcsrc/client/damage.qc
===================================================================
--- trunk/data/qcsrc/client/damage.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/client/damage.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -214,16 +214,29 @@
 
 void DamageInfo_Precache()
 {
-	precache_sound ("weapons/rocket_impact.wav");
-	precache_sound ("weapons/electro_impact.wav");
-	precache_sound ("weapons/tag_impact.wav");
-	precache_sound ("weapons/tagexp1.wav");
-	precache_sound ("weapons/tagexp2.wav");
-	precache_sound ("weapons/tagexp3.wav");
-	precache_sound ("weapons/flacexp1.wav");
-	precache_sound ("weapons/flacexp2.wav");
-	precache_sound ("weapons/flacexp3.wav");
-	precache_sound ("weapons/seekerexp1.wav");
-	precache_sound ("weapons/seekerexp2.wav");
-	precache_sound ("weapons/seekerexp3.wav");
+	precache_sound("weapons/crylink_impact2.wav");
+	precache_sound("weapons/crylink_impact.wav");
+	precache_sound("weapons/electro_impact.wav");
+	precache_sound("weapons/flacexp1.wav");
+	precache_sound("weapons/flacexp2.wav");
+	precache_sound("weapons/flacexp3.wav");
+	precache_sound("weapons/grenade_impact.wav");
+	precache_sound("weapons/hagexp1.wav");
+	precache_sound("weapons/hagexp2.wav");
+	precache_sound("weapons/hagexp3.wav");
+	precache_sound("weapons/hookbomb_impact.wav");
+	precache_sound("weapons/laserimpact.wav");
+	precache_sound("weapons/neximpact.wav");
+	precache_sound("weapons/rocket_impact.wav");
+	precache_sound("weapons/seekerexp1.wav");
+	precache_sound("weapons/seekerexp2.wav");
+	precache_sound("weapons/seekerexp3.wav");
+	precache_sound("weapons/tagexp1.wav");
+	precache_sound("weapons/tagexp2.wav");
+	precache_sound("weapons/tagexp3.wav");
+	precache_sound("weapons/tag_impact.wav");
+
+	// precache_sound ("weapons/ric1.wav"); // not used by anything
+	// precache_sound ("weapons/ric2.wav"); // not used by anything
+	// precache_sound ("weapons/ric3.wav"); // not used by anything
 }

Modified: trunk/data/qcsrc/client/projectile.qc
===================================================================
--- trunk/data/qcsrc/client/projectile.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/client/projectile.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -219,9 +219,11 @@
 				break;
 			case PROJECTILE_PORTO_RED:
 				self.colormod = '2 1 1';
+				self.alpha = 0.5;
 				break;
 			case PROJECTILE_PORTO_BLUE:
 				self.colormod = '1 1 2';
+				self.alpha = 0.5;
 				break;
 			case PROJECTILE_HAGAR_BOUNCING:
 				self.move_movetype = MOVETYPE_BOUNCE;
@@ -256,26 +258,16 @@
 void Projectile_Precache()
 {
 	precache_model("models/ebomb.mdl");
-	precache_model("models/rocket.md3");
-	precache_model("models/laser.mdl");
-	precache_model("models/tracer.mdl");
-	precache_model("models/tracer.mdl");
-	precache_model("models/plasmatrail.mdl");
 	precache_model("models/elaser.mdl");
 	precache_model("models/grenademodel.md3");
-	precache_model("models/grenademodel.md3");
-	precache_model("models/laser.mdl");
+	precache_model("models/hagarmissile.mdl");
 	precache_model("models/hlac_bullet.md3");
-	precache_model("models/hlac_bullet.md3");
+	precache_model("models/laser.mdl");
+	precache_model("models/plasmatrail.mdl");
+	precache_model("models/rocket.md3");
 	precache_model("models/tagrocket.md3");
-	precache_model("models/hagarmissile.mdl");
-	precache_model("models/grenademodel.md3");
-	precache_model("models/grenademodel.md3");
-	precache_model("models/grenademodel.md3");
-	precache_model("models/hagarmissile.mdl");
-	precache_model("models/hagarmissile.mdl");
-
-	precache_sound ("weapons/rocket_fly.wav");
-	precache_sound ("weapons/electro_fly.wav");
-	precache_sound ("weapons/tag_rocket_fly.wav");
+	precache_model("models/tracer.mdl");
+	precache_sound("weapons/electro_fly.wav");
+	precache_sound("weapons/rocket_fly.wav");
+	precache_sound("weapons/tag_rocket_fly.wav");
 }

Modified: trunk/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- trunk/data/qcsrc/server/w_campingrifle.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_campingrifle.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -135,22 +135,11 @@
 	}
 	else if (req == WR_PRECACHE)
 	{		
-		precache_model ("models/tracer.mdl");
 		precache_model ("models/weapons/g_campingrifle.md3");
 		precache_model ("models/weapons/v_campingrifle.md3");
 		precache_model ("models/weapons/w_campingrifle.zym");
 		precache_sound ("weapons/campingrifle_reload.wav");
-		precache_sound ("weapons/ric1.wav");
-		precache_sound ("weapons/ric2.wav");
-		precache_sound ("weapons/ric3.wav");
 		precache_sound ("weapons/campingrifle_fire.wav");
-		if (cvar("g_casings") >= 2)
-		{
-			precache_sound ("weapons/brass1.wav");
-			precache_sound ("weapons/brass2.wav");
-			precache_sound ("weapons/brass3.wav");
-			precache_model ("models/casing_bronze.mdl");
-		}
 	}
 	else if (req == WR_SETUP)
 	{

Modified: trunk/data/qcsrc/server/w_common.qc
===================================================================
--- trunk/data/qcsrc/server/w_common.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_common.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -162,7 +162,6 @@
 	self.W_BallisticBullet_LeaveSolid_think_save = SUB_Null;
 
 	self.flags &~= FL_ONGROUND;
-	self.effects &~= EF_NODRAW;
 
 	if(self.enemy.solid == SOLID_BSP)
 	{
@@ -235,7 +234,6 @@
 
 	self.velocity = '0 0 0';
 	self.flags |= FL_ONGROUND; // prevent moving
-	self.effects |= EF_NODRAW;
 	self.W_BallisticBullet_LeaveSolid_velocity = vel;
 
 	return 1;
@@ -280,10 +278,9 @@
 	proj.angles = vectoangles(proj.velocity);
 	proj.dmg_radius = cvar("g_ballistics_materialconstant") / bulletconstant;
 	// so: bulletconstant = bullet mass / area of bullet circle
-	setmodel(proj, "models/tracer.mdl");
+	setmodel(proj, "null");
 	setsize(proj, '0 0 0', '0 0 0');
 	setorigin(proj, start);
-	proj.effects = EF_LOWPRECISION | tracereffects;
 	proj.flags = FL_PROJECTILE;
 
 	proj.touch = W_BallisticBullet_Touch;
@@ -294,7 +291,7 @@
 
 	proj.oldvelocity = proj.velocity;
 
-	if(DEATH_WEAPONOF(dtype) == WEP_CAMPINGRIFLE)
+	if(tracereffects & EF_RED)
 		CSQCProjectile(proj, TRUE, PROJECTILE_BULLET_GLOWING);
 	else
 		CSQCProjectile(proj, TRUE, PROJECTILE_BULLET);
@@ -331,10 +328,9 @@
 		e.nextthink = time + vlen(trace_endpos - start) / 6000;
 		e.velocity = dir * 6000;
 		e.angles = vectoangles(e.velocity);
-		setmodel (e, "models/tracer.mdl"); // precision set below
+		setmodel (e, "null"); // precision set below
 		setsize (e, '0 0 0', '0 0 0');
 		setorigin (e, start);
-		e.effects = EF_LOWPRECISION;
 		e.flags = FL_PROJECTILE;
 
 		CSQCProjectile(e, TRUE, PROJECTILE_BULLET);

Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_crylink.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -86,7 +86,7 @@
 		proj.projectiledeathtype = WEP_CRYLINK;
 		//proj.gravity = 0.001;
 
-		setmodel (proj, "models/plasmatrail.mdl"); // precision set below
+		setmodel (proj, "null"); // precision set below
 		setsize (proj, '0 0 0', '0 0 0');
 		setorigin (proj, w_shotorg);
 
@@ -118,7 +118,6 @@
 
 		//proj.glow_size = 20;
 
-		proj.effects = EF_LOWPRECISION;
 		proj.flags = FL_PROJECTILE;
 
 		CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK);
@@ -152,7 +151,7 @@
 		proj.projectiledeathtype = WEP_CRYLINK | HITTYPE_SECONDARY;
 		//proj.gravity = 0.001;
 
-		setmodel (proj, "models/plasmatrail.mdl"); // precision set below
+		setmodel (proj, "null"); // precision set below
 		setsize (proj, '0 0 0', '0 0 0');
 		setorigin (proj, w_shotorg);
 
@@ -170,7 +169,6 @@
 
 		//proj.glow_size = 20;
 
-		proj.effects = EF_LOWPRECISION;
 		proj.flags = FL_PROJECTILE;
 
 		CSQCProjectile(proj, TRUE, PROJECTILE_CRYLINK);
@@ -230,15 +228,11 @@
 	}
 	else if (req == WR_PRECACHE)
 	{
-		precache_model ("models/plasma.mdl");
-		precache_model ("models/plasmatrail.mdl");
 		precache_model ("models/weapons/g_crylink.md3");
 		precache_model ("models/weapons/v_crylink.md3");
 		precache_model ("models/weapons/w_crylink.zym");
 		precache_sound ("weapons/crylink_fire.wav");
 		precache_sound ("weapons/crylink_fire2.wav");
-		precache_sound ("weapons/crylink_impact.wav");
-		precache_sound ("weapons/crylink_impact2.wav");
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_CRYLINK);

Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -89,10 +89,8 @@
 	gren.bot_dodgerating = cvar("g_balance_grenadelauncher_primary_damage");
 	gren.movetype = MOVETYPE_BOUNCE;
 	gren.solid = SOLID_BBOX;
-	gren.effects = EF_LOWPRECISION;
-	gren.modelflags = MF_TRACER2;
 	gren.projectiledeathtype = WEP_GRENADE_LAUNCHER;
-	setmodel(gren, "models/grenademodel.md3"); // precision set above
+	setmodel(gren, "null"); // precision set above
 	setsize(gren, '0 0 0', '0 0 0');
 	setorigin(gren, w_shotorg);
 
@@ -127,10 +125,8 @@
 	gren.bot_dodgerating = cvar("g_balance_grenadelauncher_secondary_damage");
 	gren.movetype = MOVETYPE_BOUNCE;
 	gren.solid = SOLID_BBOX;
-	gren.effects = EF_LOWPRECISION;
-	gren.modelflags = MF_TRACER2;
 	gren.projectiledeathtype = WEP_GRENADE_LAUNCHER | HITTYPE_SECONDARY;
-	setmodel(gren, "models/grenademodel.md3"); // precision set above
+	setmodel(gren, "null"); // precision set above
 	setsize(gren, '0 0 -3', '0 0 -3');
 	setorigin(gren, w_shotorg);
 
@@ -197,7 +193,6 @@
 	}
 	else if (req == WR_PRECACHE)
 	{
-		precache_model ("models/grenademodel.md3");
 		precache_model ("models/weapons/g_gl.md3");
 		precache_model ("models/weapons/v_gl.md3");
 		precache_model ("models/weapons/w_gl.zym");
@@ -208,7 +203,6 @@
 		precache_sound ("weapons/grenade_bounce5.wav");
 		precache_sound ("weapons/grenade_bounce6.wav");
 		precache_sound ("weapons/grenade_fire.wav");
-		precache_sound ("weapons/grenade_impact.wav");
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_GRENADE_LAUNCHER);

Modified: trunk/data/qcsrc/server/w_hagar.qc
===================================================================
--- trunk/data/qcsrc/server/w_hagar.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_hagar.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -69,14 +69,12 @@
 	missile.scale = 0.4; // BUG: the model is too big
 	missile.projectiledeathtype = WEP_HAGAR;
 	setorigin (missile, w_shotorg);
-	setmodel (missile, "models/hagarmissile.mdl"); // precision set below
+	setmodel (missile, "null"); // precision set below
 	setsize (missile, '0 0 0', '0 0 0');
 	//missile.takedamage = DAMAGE_YES;
 	//missile.damageforcescale = 4;
 	//missile.health = 10;
 	//missile.event_damage = W_Hagar_Damage;
-	missile.effects = EF_LOWPRECISION;
-	missile.modelflags = MF_GRENADE;
 
 	missile.movetype = MOVETYPE_FLY;
 	missile.velocity = (w_shotdir + randomvec() * cvar("g_balance_hagar_primary_spread")) * cvar("g_balance_hagar_primary_speed");
@@ -113,14 +111,12 @@
 	missile.scale = 0.4; // BUG: the model is too big
 	missile.projectiledeathtype = WEP_HAGAR | HITTYPE_SECONDARY;
 	setorigin (missile, w_shotorg);
-	setmodel (missile, "models/hagarmissile.mdl"); // precision set below
+	setmodel (missile, "null"); // precision set below
 	setsize (missile, '0 0 0', '0 0 0');
 	//missile.takedamage = DAMAGE_YES;
 	//missile.damageforcescale = 4;
 	//missile.health = 10;
 	//missile.event_damage = W_Hagar_Damage;
-	missile.effects = EF_LOWPRECISION;
-	missile.modelflags = MF_GRENADE;
 
 	missile.movetype = MOVETYPE_BOUNCEMISSILE;
 	missile.velocity = (w_shotdir + randomvec() * cvar("g_balance_hagar_secondary_spread")) * cvar("g_balance_hagar_secondary_speed");
@@ -165,14 +161,10 @@
 	}
 	else if (req == WR_PRECACHE)
 	{
-		precache_model ("models/hagarmissile.mdl");
 		precache_model ("models/weapons/g_hagar.md3");
 		precache_model ("models/weapons/v_hagar.md3");
 		precache_model ("models/weapons/w_hagar.zym");
 		precache_sound ("weapons/hagar_fire.wav");
-		precache_sound ("weapons/hagexp1.wav");
-		precache_sound ("weapons/hagexp2.wav");
-		precache_sound ("weapons/hagexp3.wav");
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_HAGAR);

Modified: trunk/data/qcsrc/server/w_hlac.qc
===================================================================
--- trunk/data/qcsrc/server/w_hlac.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_hlac.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -69,7 +69,6 @@
 
     missile.nextthink = time + cvar("g_balance_hlac_primary_lifetime");
 
-	missile.effects = EF_LOWPRECISION;
 	missile.flags = FL_PROJECTILE;
 	missile.projectiledeathtype = WEP_HLAC;
 
@@ -115,7 +114,6 @@
 
     missile.nextthink = time + cvar("g_balance_hlac_secondary_lifetime");
 
-	missile.effects = EF_LOWPRECISION;
 	missile.flags = FL_PROJECTILE;
 	missile.projectiledeathtype = WEP_HLAC | HITTYPE_SECONDARY;
 
@@ -202,16 +200,11 @@
 	}
 	else if (req == WR_PRECACHE)
 	{
-	    precache_sound ("weapons/laserimpact.wav");
-        precache_sound ("weapons/lasergun_fire.wav");
-
         precache_model ("models/weapons/g_hlac.md3");
 		precache_model ("models/weapons/v_hlac.md3");
 		precache_model ("models/weapons/w_hlac.zym");
 		precache_sound ("weapons/lasergun_fire.wav");
 
-		precache_model ("models/hlac_bullet.md3");
-
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_HLAC);

Modified: trunk/data/qcsrc/server/w_hook.qc
===================================================================
--- trunk/data/qcsrc/server/w_hook.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_hook.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -68,10 +68,8 @@
 	gren.bot_dodgerating = cvar("g_balance_hook_secondary_damage");
 	gren.movetype = MOVETYPE_TOSS;
 	gren.solid = SOLID_BBOX;
-	gren.effects = EF_LOWPRECISION;
-	gren.modelflags = MF_TRACER2;
 	gren.projectiledeathtype = WEP_HOOK | HITTYPE_SECONDARY;
-	setmodel(gren, "models/grenademodel.md3"); // precision set above // FIXME replace
+	setmodel(gren, "null"); // precision set above // FIXME replace
 	setsize(gren, '0 0 0', '0 0 0');
 	setorigin(gren, w_shotorg);
 
@@ -207,10 +205,9 @@
 		precache_model ("models/weapons/g_hookgun.md3");
 		precache_model ("models/weapons/v_hookgun.md3");
 		precache_model ("models/weapons/w_hookgun.zym");
+		precache_sound ("weapons/hook_impact.wav"); // done by g_hook.qc
 		precache_sound ("weapons/hook_fire.wav");
-		precache_sound ("weapons/hook_impact.wav");
 		precache_sound ("weapons/hookbomb_fire.wav");
-		precache_sound ("weapons/hookbomb_impact.wav");
 	}
 	else if (req == WR_SETUP)
 	{

Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_laser.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -43,7 +43,7 @@
 	if(issecondary)
 		missile.projectiledeathtype |= HITTYPE_SECONDARY;
 
-	setmodel (missile, "models/laser.mdl"); // precision set below
+	setmodel (missile, "null"); // precision set below
 	setsize (missile, '0 0 0', '0 0 0');
 	setorigin (missile, w_shotorg);
 
@@ -62,7 +62,6 @@
 	else
 		missile.nextthink = time + cvar("g_balance_laser_primary_lifetime");
 
-	missile.effects = EF_LOWPRECISION;
 	missile.flags = FL_PROJECTILE;
 
 	CSQCProjectile(missile, TRUE, PROJECTILE_LASER);
@@ -113,11 +112,9 @@
 	}
 	else if (req == WR_PRECACHE)
 	{
-		precache_model ("models/laser.mdl");
 		precache_model ("models/weapons/v_laser.md3");
 		precache_model ("models/weapons/w_laser.zym");
 		precache_sound ("weapons/lasergun_fire.wav");
-		precache_sound ("weapons/laserimpact.wav");
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_LASER);

Modified: trunk/data/qcsrc/server/w_minstanex.qc
===================================================================
--- trunk/data/qcsrc/server/w_minstanex.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_minstanex.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -163,7 +163,6 @@
 		precache_model ("models/weapons/v_minstanex.md3");
 		precache_model ("models/weapons/w_minstanex.zym");
 		precache_sound ("weapons/minstanexfire.wav");
-		precache_sound ("weapons/neximpact.wav");
 		w_laser(WR_PRECACHE);
 	}
 	else if (req == WR_SETUP)

Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_nex.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -47,7 +47,6 @@
 		precache_model ("models/weapons/v_nex.md3");
 		precache_model ("models/weapons/w_nex.zym");
 		precache_sound ("weapons/nexfire.wav");
-		precache_sound ("weapons/neximpact.wav");
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_NEX);

Modified: trunk/data/qcsrc/server/w_porto.qc
===================================================================
--- trunk/data/qcsrc/server/w_porto.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_porto.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -168,10 +168,9 @@
 	gren.bot_dodgerating = 200;
 	gren.movetype = MOVETYPE_BOUNCEMISSILE;
 	gren.solid = SOLID_BBOX;
-	gren.effects = EF_LOWPRECISION | EF_RED | EF_ADDITIVE;
+	gren.effects = EF_RED;
 	gren.scale = 4;
-	gren.modelflags = MF_TRACER;
-	setmodel(gren, "models/grenademodel.md3"); // precision set above
+	setmodel(gren, "null"); // precision set above
 	setsize(gren, '0 0 0', '0 0 0');
 	setorigin(gren, w_shotorg);
 
@@ -261,7 +260,6 @@
 	}
 	else if (req == WR_PRECACHE)
 	{
-		precache_model ("models/grenademodel.md3");
 		precache_model ("models/weapons/g_porto.md3");
 		precache_model ("models/weapons/v_porto.md3");
 		precache_model ("models/weapons/w_porto.zym");

Modified: trunk/data/qcsrc/server/w_seeker.qc
===================================================================
--- trunk/data/qcsrc/server/w_seeker.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_seeker.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -412,8 +412,6 @@
 	setsize (missile, '0 0 0', '0 0 0');
 	missile.projectiledeathtype = WEP_SEEKER | HITTYPE_SECONDARY;
 
-	missile.modelflags = MF_TRACER3;
-
 	missile.movetype = MOVETYPE_FLY;
 	w_shotdir = w_shotdir + '0 0 0.3';
 	missile.velocity    = (w_shotdir  + randomvec() * cvar("g_balance_seeker_flac_spread")) * cvar("g_balance_seeker_flac_speed");

Modified: trunk/data/qcsrc/server/w_shotgun.qc
===================================================================
--- trunk/data/qcsrc/server/w_shotgun.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_shotgun.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -122,22 +122,11 @@
 	else if (req == WR_PRECACHE)
 	{
 		precache_model ("models/uziflash.md3");
-		precache_model ("models/tracer.mdl");
 		precache_model ("models/weapons/g_shotgun.md3");
 		precache_model ("models/weapons/v_shotgun.md3");
 		precache_model ("models/weapons/w_shotgun.zym");
 		precache_sound ("misc/itempickup.wav");
-		precache_sound ("weapons/ric1.wav");
-		precache_sound ("weapons/ric2.wav");
-		precache_sound ("weapons/ric3.wav");
 		precache_sound ("weapons/shotgun_fire.wav");
-		if (cvar("g_casings") >= 1)
-		{
-			precache_sound ("weapons/casings1.wav");
-			precache_sound ("weapons/casings2.wav");
-			precache_sound ("weapons/casings3.wav");
-			precache_model ("models/casing_shell.mdl");
-		}
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_SHOTGUN);

Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc	2009-01-19 07:22:24 UTC (rev 5609)
+++ trunk/data/qcsrc/server/w_uzi.qc	2009-01-19 07:36:12 UTC (rev 5610)
@@ -127,22 +127,11 @@
 	}
 	else if (req == WR_PRECACHE)
 	{
-		precache_model ("models/tracer.mdl");
 		precache_model ("models/uziflash.md3");
 		precache_model ("models/weapons/g_uzi.md3");
 		precache_model ("models/weapons/v_uzi.md3");
 		precache_model ("models/weapons/w_uzi.zym");
-		precache_sound ("weapons/ric1.wav");
-		precache_sound ("weapons/ric2.wav");
-		precache_sound ("weapons/ric3.wav");
 		precache_sound ("weapons/uzi_fire.wav");
-		if (cvar("g_casings") >= 2)
-		{
-			precache_sound ("weapons/brass1.wav");
-			precache_sound ("weapons/brass2.wav");
-			precache_sound ("weapons/brass3.wav");
-			precache_model ("models/casing_bronze.mdl");
-		}
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_UZI);




More information about the nexuiz-commits mailing list