Revert "change ALL sound calls AGAIN (damn Spike)"

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_minstanex.qc

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index b826b98543c61639be69a7cb25f2c5c9ddec782a..c0376547ab6cc0c17023cccf647bd5d8235d67a2 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -9,7 +9,7 @@ void W_MinstaNex_Attack (void)
        float flying;
        flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
 
-       W_SetupShot (self, TRUE, 0, "weapons/minstanexfire.wav", CHAN_WEAPON, 10000);
+       W_SetupShot (self, TRUE, 0, "weapons/minstanexfire.wav", CH_WEAPON_A, 10000);
 
        yoda = 0;
        damage_goodhits = 0;
@@ -43,7 +43,7 @@ void W_MinstaNex_Attack (void)
        // teamcolor / hit beam effect
        vector v;
        v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
-       if(teams_matter)
+       if(teamplay)
        {
            switch(self.team)
            {
@@ -94,6 +94,7 @@ void minstagib_ammocheck (void)
                return;
 
        if (self.ammo_cells <= 0)
+       if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
        {
                if (self.health == 5)
                {
@@ -168,10 +169,17 @@ void minstagib_ammocheck (void)
 
 void spawnfunc_weapon_minstanex (void); // defined in t_items.qc
 
-float minstanex_ammo;
 float w_minstanex(float req)
 {
        float ammo_amount;
+       float minstanex_ammo;
+
+       // now multiple WR_s use this
+       if(g_minstagib)
+               minstanex_ammo = 1;
+       else
+               minstanex_ammo = autocvar_g_balance_minstanex_ammo;
+
        if (req == WR_AIM)
        {
                if(self.ammo_cells > 0)
@@ -181,11 +189,6 @@ float w_minstanex(float req)
        }
        else if (req == WR_THINK)
        {
-               if(g_minstagib)
-                       minstanex_ammo = 1;
-               else
-                       minstanex_ammo = autocvar_g_balance_minstanex_ammo;
-
                // if the laser uses load, we also consider its ammo for reloading
                if(autocvar_g_balance_minstanex_reload_ammo && autocvar_g_balance_minstanex_laser_ammo && self.clip_load < min(minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo)) // forced reload
                        weapon_action(self.weapon, WR_RELOAD);
@@ -228,7 +231,7 @@ float w_minstanex(float req)
                precache_sound ("weapons/nexwhoosh1.wav");
                precache_sound ("weapons/nexwhoosh2.wav");
                precache_sound ("weapons/nexwhoosh3.wav");
-               precache_sound ("weapons/reload.wav");
+               //precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else
                w_laser(WR_PRECACHE);
        }
        else if (req == WR_SETUP)
@@ -239,8 +242,8 @@ float w_minstanex(float req)
        }
        else if (req == WR_CHECKAMMO1)
        {
-               ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_ammo;
-               ammo_amount += self.weapon_load[WEP_MINSTANEX] >= autocvar_g_balance_minstanex_ammo;
+               ammo_amount = self.ammo_cells >= minstanex_ammo;
+               ammo_amount += self.weapon_load[WEP_MINSTANEX] >= minstanex_ammo;
                return ammo_amount;
        }
        else if (req == WR_CHECKAMMO2)
@@ -259,9 +262,9 @@ float w_minstanex(float req)
        {
                float used_ammo;
                if(autocvar_g_balance_minstanex_laser_ammo)
-                       used_ammo = min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo);
+                       used_ammo = min(minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo);
                else
-                       used_ammo = autocvar_g_balance_minstanex_ammo;
+                       used_ammo = minstanex_ammo;
 
                W_Reload(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav");
        }
@@ -277,14 +280,14 @@ float w_minstanex(float req)
                org2 = w_org + w_backoff * 6;
                pointparticles(particleeffectnum("nex_impact"), org2, '0 0 0', 1);
                if(!w_issilent)
-                       sound(self, CHAN_PROJECTILE, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM);
+                       sound(self, CH_SHOTS_SINGLE, "weapons/neximpact.wav", VOL_BASE, ATTN_NORM);
        }
        else if(req == WR_PRECACHE)
        {
                precache_sound("weapons/neximpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = _("%s did the impossible");
+               w_deathtypestring = _("%s is now thinking with portals");
        else if (req == WR_KILLMESSAGE)
                w_deathtypestring = _("%s has been vaporized by %s");
        return TRUE;