r5535 - in trunk/data/qcsrc/server/tturrets: system units
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Jan 15 01:58:24 EST 2009
Author: div0
Date: 2009-01-15 01:58:24 -0500 (Thu, 15 Jan 2009)
New Revision: 5535
Modified:
trunk/data/qcsrc/server/tturrets/system/system_damage.qc
trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
trunk/data/qcsrc/server/tturrets/units/unit_flac.qc
trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc
trunk/data/qcsrc/server/tturrets/units/unit_hk.qc
trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc
trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc
trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc
trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
Log:
properly use the base volume for turrets
Modified: trunk/data/qcsrc/server/tturrets/system/system_damage.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_damage.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/system/system_damage.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -128,7 +128,7 @@
self.deadflag = DEAD_DEAD;
self.tur_head.deadflag = self.deadflag;
- sound (self, CHAN_PLAYER, "weapons/rocket_impact.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PLAYER, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
org2 = self.origin + '0 0 40';
// Explotion grafix
Modified: trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -14,7 +14,7 @@
#else
RadiusDamage (self, self.owner, self.owner.shot_dmg, 0, self.owner.shot_radius, world, self.owner.shot_force, DEATH_TURRET, world);
#endif
- sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
remove (self);
}
@@ -34,7 +34,7 @@
self.tur_shotorg = v;
turret_do_updates(self);
- sound (self, CHAN_WEAPON, "weapons/lasergun_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/lasergun_fire.wav", VOL_BASE, ATTN_NORM);
pointparticles(particleeffectnum("laser_muzzleflash"), self.tur_shotorg_updated, self.tur_shotdir_updated * 1000, 1);
proj = spawn ();
Modified: trunk/data/qcsrc/server/tturrets/units/unit_flac.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_flac.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_flac.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -9,7 +9,7 @@
turret_tag_fire_update();
- sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", VOL_BASE, ATTN_NORM);
proj = spawn ();
setorigin(proj, self.tur_shotorg_updated);
setmodel(proj, "models/turrets/pd_proj.md3");
@@ -43,11 +43,11 @@
ftmp = crandom();
if (ftmp<-0.7)
- sound (self, CHAN_PROJECTILE, "weapons/hagexp1.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/hagexp1.wav", VOL_BASE, ATTN_NORM);
else if (ftmp<0.4)
- sound (self, CHAN_PROJECTILE, "weapons/hagexp2.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/hagexp2.wav", VOL_BASE, ATTN_NORM);
else if (ftmp<1)
- sound (self, CHAN_PROJECTILE, "weapons/hagexp3.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/hagexp3.wav", VOL_BASE, ATTN_NORM);
self.event_damage = SUB_Null;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -27,11 +27,11 @@
{
local entity missile;
- sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", VOL_BASE, ATTN_NORM);
missile = spawn ();
setorigin(missile, self.tur_shotorg_updated);
- sound (missile, CHAN_PAIN, "weapons/rocket_fly.wav", 0.4, ATTN_NORM);
+ sound (missile, CHAN_PAIN, "weapons/rocket_fly.wav", 0.4 * VOL_BASE, ATTN_NORM);
setmodel (missile, "models/turrets/mlrs_rocket.md3"); // precision set below
setsize (missile, '-3 -3 -3', '3 3 3'); // give it some size so it can be shot
@@ -158,7 +158,7 @@
}
stopsound (self, CHAN_PAIN);
- sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
org2 = findbetterlocation (self.origin, 16);
// LordHavoc: TE_TEI_BIGEXPLOSION
Modified: trunk/data/qcsrc/server/tturrets/units/unit_hk.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_hk.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_hk.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -85,13 +85,13 @@
local entity missile;
//local entity flash2;
- sound (self, CHAN_WEAPON, "weapons/rocket_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/rocket_fire.wav", VOL_BASE, ATTN_NORM);
missile = spawn ();
missile.solid = SOLID_BBOX;
setmodel (missile, "models/turrets/hunter2.md3"); // precision set below
setsize (missile, missile.mins,missile.maxs); // give it some size so it can be shot
- sound (missile, CHAN_PAIN, "weapons/rocket_fly.wav", 0.4, ATTN_NORM);
+ sound (missile, CHAN_PAIN, "weapons/rocket_fly.wav", 0.4 * VOL_BASE, ATTN_NORM);
setorigin(missile, self.tur_shotorg_updated);
missile.scale = 1;
@@ -304,7 +304,7 @@
self.cnt = time + 0.25;
self.nextthink = 0;
self.movetype = MOVETYPE_BOUNCE;
- sound (self, CHAN_VOICE, "", 0.4, ATTN_NORM);
+ sound (self, CHAN_VOICE, "", 0.4 * VOL_BASE, ATTN_NORM);
return;
}
@@ -364,7 +364,7 @@
//vector org2;
stopsound (self, CHAN_PAIN);
- sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
org2 = findbetterlocation (self.origin, 16);
// LordHavoc: TE_TEI_BIGEXPLOSION
Modified: trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -7,7 +7,7 @@
{
entity flash;
- sound (self, CHAN_WEAPON, "weapons/uzi_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM);
fireBullet (self.tur_shotorg_updated, self.tur_shotdir_updated,self.shot_spread, self.shot_dmg, self.shot_force, DEATH_TURRET, FALSE);
te_smallflash(self.tur_shotorg_updated);
Modified: trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -20,12 +20,12 @@
turret_tag_fire_update();
- sound (self, CHAN_WEAPON, "weapons/rocket_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/rocket_fire.wav", VOL_BASE, ATTN_NORM);
missile = spawn ();
setmodel (missile, "models/turrets/rocket.md3"); // precision set below
setsize (missile, '-3 -3 -3', '3 3 3'); // give it some size so it can be shot
- sound (missile, CHAN_PAIN, "weapons/rocket_fly.wav", 0.4, ATTN_NORM);
+ sound (missile, CHAN_PAIN, "weapons/rocket_fly.wav", 0.4 * VOL_BASE, ATTN_NORM);
setorigin(missile, self.tur_shotorg_updated);
missile.classname = "mlrs_missile";
missile.owner = self;
@@ -65,7 +65,7 @@
stopsound (self, CHAN_PAIN);
- sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
org2 = findbetterlocation (self.origin, 16);
pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1);
Modified: trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -40,7 +40,7 @@
self.owner.attack_finished_single = time + self.owner.shot_refire;
self.owner.fireflag = 2;
self.owner.tur_head.frame = 10;
- sound (self, CHAN_PROJECTILE, "", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "", VOL_BASE, ATTN_NORM);
remove(self);
return;
}
@@ -50,7 +50,7 @@
if (time - self.shot_spread > 0)
{
self.shot_spread = time + 2;
- sound (self, CHAN_VOICE, "turrets/phaser.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_VOICE, "turrets/phaser.ogg", VOL_BASE, ATTN_NORM);
}
@@ -93,7 +93,7 @@
beam.enemy = self.enemy;
beam.bot_dodge = TRUE;
beam.bot_dodgerating = beam.shot_dmg;
- sound (beam, CHAN_PROJECTILE, "turrets/phaser.ogg", 1, ATTN_NORM);
+ sound (beam, CHAN_PROJECTILE, "turrets/phaser.ogg", VOL_BASE, ATTN_NORM);
self.fireflag = 1;
beam.attack_finished_single = self.attack_finished_single;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -32,7 +32,7 @@
turret_tag_fire_update();
- sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", VOL_BASE, ATTN_NORM);
pointparticles(particleeffectnum("laser_muzzleflash"), self.tur_shotorg_updated, self.tur_shotdir_updated * 1000, 1);
proj = spawn ();
@@ -69,7 +69,7 @@
turret_tag_fire_update();
- sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", VOL_BASE, ATTN_NORM);
proj = spawn ();
setorigin(proj, self.tur_shotorg_updated);
setsize(proj, '0 0 0', '0 0 0');
@@ -125,7 +125,7 @@
#else
RadiusDamage (self, self.owner, self.owner.shot_dmg, 0, self.owner.shot_radius, world, self.owner.shot_force, DEATH_TURRET, world);
#endif
- sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/electro_impact.wav", VOL_BASE, ATTN_NORM);
remove (self);
}
Modified: trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-01-15 06:56:52 UTC (rev 5534)
+++ trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-01-15 06:58:24 UTC (rev 5535)
@@ -141,7 +141,7 @@
}
stopsound (self, CHAN_PAIN);
- sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", 1, ATTN_NORM);
+ sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
org2 = findbetterlocation (self.origin, 16);
pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1);
@@ -310,8 +310,8 @@
rocket = spawn ();
setorigin(rocket, org);
- sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", 1, ATTN_NORM);
- sound (rocket, CHAN_PAIN, "weapons/rocket_fly.wav", 0.4, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", VOL_BASE, ATTN_NORM);
+ sound (rocket, CHAN_PAIN, "weapons/rocket_fly.wav", 0.4 * VOL_BASE, ATTN_NORM);
setmodel (rocket, "models/turrets/rocket.md3"); // precision set below
setsize (rocket, '-3 -3 -3', '3 3 3'); // give it some size so it can be shot
@@ -588,7 +588,7 @@
self.tur_head.frame = self.tur_head.frame + 1;
- sound (self, CHAN_WEAPON, "weapons/uzi_fire.wav", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM);
fireBullet (self.tur_shotorg_updated, self.tur_shotdir_updated,self.shot_spread, self.shot_dmg, self.shot_force, DEATH_TURRET, FALSE);
More information about the nexuiz-commits
mailing list