r5609 - in trunk/data/qcsrc: client server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jan 19 02:22:36 EST 2009
Author: div0
Date: 2009-01-19 02:22:24 -0500 (Mon, 19 Jan 2009)
New Revision: 5609
Modified:
trunk/data/qcsrc/client/Main.qc
trunk/data/qcsrc/client/damage.qc
trunk/data/qcsrc/client/gibs.qc
trunk/data/qcsrc/client/projectile.qc
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_rocketlauncher.qc
trunk/data/qcsrc/server/w_seeker.qc
Log:
move some weapon precache stuff to where it belongs... the others follow later
Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/client/Main.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -137,6 +137,7 @@
Projectile_Precache();
GibSplash_Precache();
Casings_Precache();
+ DamageInfo_Precache();
}
// CSQC_Shutdown : Called every time the CSQC code is shutdown (changing maps, quitting, etc)
Modified: trunk/data/qcsrc/client/damage.qc
===================================================================
--- trunk/data/qcsrc/client/damage.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/client/damage.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -211,3 +211,19 @@
}
}
}
+
+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");
+}
Modified: trunk/data/qcsrc/client/gibs.qc
===================================================================
--- trunk/data/qcsrc/client/gibs.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/client/gibs.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -170,4 +170,10 @@
precache_model("models/gibs/arm.md3");
precache_model("models/gibs/bloodyskull.md3");
precache_model("models/gibs/eye.md3");
+
+ precache_sound ("misc/gib.wav");
+ precache_sound ("misc/gib_splat01.wav");
+ precache_sound ("misc/gib_splat02.wav");
+ precache_sound ("misc/gib_splat03.wav");
+ precache_sound ("misc/gib_splat04.wav");
}
Modified: trunk/data/qcsrc/client/projectile.qc
===================================================================
--- trunk/data/qcsrc/client/projectile.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/client/projectile.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -274,4 +274,8 @@
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");
}
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/server/g_damage.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -38,6 +38,7 @@
e.dmg_radius = rad;
e.dmg_force = vlen(force);
e.velocity = force;
+ e.effects = EF_NODEPTHTEST; // needs to be, sorry
e.oldorigin_x = compressShortVector(e.velocity);
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -1325,20 +1325,6 @@
// gore and miscellaneous sounds
//precache_sound ("misc/h2ohit.wav");
- precache_model ("models/gibs/bloodyskull.md3");
- precache_model ("models/gibs/chunk.mdl");
- precache_model ("models/gibs/eye.md3");
- precache_model ("models/gibs/gib1.md3");
- precache_model ("models/gibs/gib2.md3");
- precache_model ("models/gibs/gib3.md3");
- precache_model ("models/gibs/gib4.md3");
- precache_model ("models/gibs/gib5.md3");
- precache_model ("models/gibs/gib6.md3");
- precache_model ("models/gibs/smallchest.md3");
- precache_model ("models/gibs/chest.md3");
- precache_model ("models/gibs/arm.md3");
- precache_model ("models/gibs/leg1.md3");
- precache_model ("models/gibs/leg2.md3");
precache_model ("models/hook.md3");
precache_sound ("misc/armorimpact.wav");
precache_sound ("misc/bodyimpact1.wav");
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/server/w_electro.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -92,14 +92,13 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_primary_ammo");
- proj.effects = EF_BRIGHTFIELD | EF_LOWPRECISION;
proj.movetype = MOVETYPE_FLY;
proj.velocity = w_shotdir * cvar("g_balance_electro_primary_speed");
W_SetupProjectileVelocity(proj);
proj.angles = vectoangles(proj.velocity);
proj.touch = W_Plasma_TouchExplode;
proj.flags = FL_PROJECTILE;
- setmodel(proj, "models/elaser.mdl"); // precision set above
+ setmodel(proj, "null"); // precision set above
setsize(proj, '0 0 0', '0 0 0');
//sound (proj, CHAN_PAIN, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM);
@@ -130,14 +129,13 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_secondary_ammo");
- proj.effects = EF_LOWPRECISION;
//proj.glow_size = 50;
//proj.glow_color = 45;
proj.movetype = MOVETYPE_BOUNCE;
proj.velocity = (w_shotdir + randomvec() * cvar("g_balance_electro_secondary_spread")) * cvar("g_balance_electro_secondary_speed") + v_up * cvar("g_balance_electro_secondary_speed_up");
W_SetupProjectileVelocity(proj);
proj.touch = W_Plasma_Touch;
- setmodel(proj, "models/ebomb.mdl"); // precision set above
+ setmodel(proj, "null"); // precision set above
setsize(proj, '0 0 -3', '0 0 -3');
proj.takedamage = DAMAGE_YES;
proj.damageforcescale = 4;
@@ -146,6 +144,7 @@
proj.flags = FL_PROJECTILE;
CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO);
+ proj.effects = EF_NODEPTHTEST;
}
void spawnfunc_weapon_electro (void)
@@ -196,16 +195,12 @@
}
else if (req == WR_PRECACHE)
{
- precache_model ("models/ebomb.mdl");
- precache_model ("models/elaser.mdl");
precache_model ("models/weapons/g_electro.md3");
precache_model ("models/weapons/v_electro.md3");
precache_model ("models/weapons/w_electro.zym");
precache_sound ("weapons/electro_bounce.wav");
precache_sound ("weapons/electro_fire.wav");
precache_sound ("weapons/electro_fire2.wav");
- precache_sound ("weapons/electro_fly.wav");
- precache_sound ("weapons/electro_impact.wav");
precache_sound ("weapons/electro_impact_combo.wav");
}
else if (req == WR_SETUP)
Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -221,7 +221,7 @@
missile.movetype = MOVETYPE_FLY;
missile.solid = SOLID_BBOX;
missile.projectiledeathtype = WEP_ROCKET_LAUNCHER;
- setmodel (missile, "models/rocket.md3"); // precision set below
+ setmodel (missile, "null"); // precision set below
setsize (missile, '-3 -3 -3', '3 3 3'); // give it some size so it can be shot
setorigin (missile, w_shotorg - v_forward * 3); // move it back so it hits the wall at the right point
@@ -236,11 +236,10 @@
missile.think = W_Rocket_Think;
missile.nextthink = time;
missile.cnt = time + cvar("g_balance_rocketlauncher_lifetime");
- missile.effects = EF_LOWPRECISION;
- //sound (missile, CHAN_PAIN, "weapons/rocket_fly.wav", VOL_BASE, ATTN_NORM);
missile.flags = FL_PROJECTILE;
CSQCProjectile(missile, cvar("g_balance_rocketlauncher_speedaccel") == 0 && cvar("g_laserguided_missiles") == 0, PROJECTILE_ROCKET);
+ missile.effects |= EF_NODEPTHTEST; // because of fly sound
// muzzle flash for 1st person view
flash = spawn ();
@@ -434,14 +433,11 @@
else if (req == WR_PRECACHE)
{
precache_model ("models/flash.md3");
- precache_model ("models/rocket.md3");
precache_model ("models/weapons/g_rl.md3");
precache_model ("models/weapons/v_rl.md3");
precache_model ("models/weapons/w_rl.zym");
precache_sound ("weapons/rocket_det.wav");
precache_sound ("weapons/rocket_fire.wav");
- precache_sound ("weapons/rocket_fly.wav");
- precache_sound ("weapons/rocket_impact.wav");
if (g_laserguided_missile)
{
precache_model ("models/laser_dot.mdl"); // rocket launcher
Modified: trunk/data/qcsrc/server/w_seeker.qc
===================================================================
--- trunk/data/qcsrc/server/w_seeker.qc 2009-01-19 07:00:57 UTC (rev 5608)
+++ trunk/data/qcsrc/server/w_seeker.qc 2009-01-19 07:22:24 UTC (rev 5609)
@@ -142,8 +142,6 @@
{
self.think = Seeker_Missile_Think;
self.nextthink = time + cvar("g_balance_seeker_missile_activate_delay");
- self.effects = EF_LOWPRECISION | EF_NOSHADOW;
- self.modelflags = MF_ROCKET;
if (cvar("g_balance_seeker_guided_proxy"))
self.movetype = MOVETYPE_BOUNCEMISSILE;
@@ -183,7 +181,6 @@
missile.cnt = time + cvar("g_balance_seeker_missile_lifetime");
missile.enemy = self.enemy;
missile.switchweapon = cvar("g_balance_seeker_missile_speed");
- missile.effects = EF_LOWPRECISION | EF_NOSHADOW;
missile.solid = SOLID_BBOX;
missile.scale = 2;
missile.takedamage = DAMAGE_YES;
@@ -192,7 +189,7 @@
missile.projectiledeathtype = WEP_SEEKER;
setorigin (missile, w_shotorg);
- setmodel (missile, "models/tagrocket.md3");
+ setmodel (missile, "null");
setsize (missile, '-2 -2 -2', '2 2 2');
@@ -336,13 +333,10 @@
missile.event_damage = Seeker_Tag_Explode;
missile.health = 5;
- setmodel (missile, "models/laser.mdl"); // TODO make this seeker specific
+ setmodel (missile, "null");
setorigin (missile, w_shotorg);
setsize (missile, '0 0 0', '0 0 0');
- missile.effects = EF_FULLBRIGHT | EF_NOSHADOW | EF_LOWPRECISION;
- missile.modelflags = MF_TRACER3;
- //sound (missile, CHAN_PAIN, "weapons/tag_rocket_fly.wav", VOL_BASE, ATTN_NORM); // csqc
missile.flags = FL_PROJECTILE;
missile.velocity = w_shotdir * cvar("g_balance_seeker_tag_speed");
@@ -351,6 +345,7 @@
missile.angles = vectoangles (missile.velocity);
CSQCProjectile(missile, TRUE, PROJECTILE_TAG);
+ missile.effects = EF_NODEPTHTEST;
}
@@ -413,11 +408,10 @@
missile.scale = 0.4; // BUG: the model is too big
missile.projectiledeathtype = WEP_SEEKER;
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.projectiledeathtype = WEP_SEEKER | HITTYPE_SECONDARY;
- missile.effects = EF_LOWPRECISION;
missile.modelflags = MF_TRACER3;
missile.movetype = MOVETYPE_FLY;
@@ -461,25 +455,12 @@
}
else if (req == WR_PRECACHE)
{
- precache_model ("models/hagarmissile.mdl");
- precache_model ("models/tagrocket.md3");
precache_model ("models/weapons/g_seeker.md3");
precache_model ("models/weapons/v_seeker.md3");
precache_model ("models/weapons/w_seeker.zym");
precache_sound ("weapons/tag_fire.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/tag_rocket_fly.wav");
precache_sound ("weapons/flac_fire.wav");
- precache_sound ("weapons/flacexp1.wav");
- precache_sound ("weapons/flacexp2.wav");
- precache_sound ("weapons/flacexp3.wav");
precache_sound ("weapons/seeker_fire.wav");
- precache_sound ("weapons/seekerexp1.wav");
- precache_sound ("weapons/seekerexp2.wav");
- precache_sound ("weapons/seekerexp3.wav");
}
else if (req == WR_SETUP)
weapon_setup(WEP_SEEKER);
More information about the nexuiz-commits
mailing list