]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
lightning gun fire sound
authorFruitieX <rasse@rasse-lappy.localdomain>
Tue, 20 Jul 2010 00:11:44 +0000 (03:11 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Tue, 20 Jul 2010 00:11:44 +0000 (03:11 +0300)
qcsrc/server/w_electro.qc
sound/weapons/lgbeam_fire.ogg [new file with mode: 0644]

index c2e57d20255922a9b53e260fff4f7b428afebf65..2ee2b294557b5c989fd4a5839308065b04720d13 100644 (file)
@@ -185,9 +185,10 @@ void W_Electro_Attack2()
 }
 
 .entity lgbeam, exteriorlgbeam;
-.float nextdamagethink;
+.float prevlgfire;
 void lgbeam_think()
 {
+       self.owner.prevlgfire = time;
        if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK)
        {
                remove(self);
@@ -241,6 +242,12 @@ void lgbeam_think()
 // experimental lightning gun
 void W_Electro_Attack3 (void)
 {
+       // only play fire sound if 0.5 sec has passed since player let go the fire button
+       if(time - self.prevlgfire > 0.5)
+       {
+               sound (self, CHAN_PROJECTILE, "weapons/lgbeam_fire.wav", VOL_BASE, ATTN_NORM);
+       }
+
        entity beam, oldself;
 
        self.lgbeam = beam = spawn();
@@ -359,7 +366,9 @@ float w_electro(float req)
                precache_sound ("weapons/electro_impact.wav");
                precache_sound ("weapons/electro_impact_combo.wav");
                if(cvar("g_balance_electro_lightning"))
-                       precache_sound ("weapons/crylink_fire2.wav");
+               {
+                       precache_sound ("weapons/lgbeam_fire.wav");
+               }
        }
        else if (req == WR_SETUP)
                weapon_setup(WEP_ELECTRO);
diff --git a/sound/weapons/lgbeam_fire.ogg b/sound/weapons/lgbeam_fire.ogg
new file mode 100644 (file)
index 0000000..d3cd355
Binary files /dev/null and b/sound/weapons/lgbeam_fire.ogg differ