Broken attempt to bring back switching weapons while dead, uncovers some bug somewher...

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / overkill / overkill.qc

diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qc b/qcsrc/common/mutators/mutator/overkill/overkill.qc
index 972220e7516d21e650870afe7e533f969dc0b5a9..2dc6e841446f54ddaa9939ddc153eda930bf6142 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc
@@ -182,7 +182,13 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
 
        if(self.ok_lastwep)
        {
-               PS(self).m_switchweapon = Weapons_from(self.ok_lastwep);
+               Weapon newwep = Weapons_from(self.ok_lastwep);
+               if(self.ok_lastwep == WEP_HMG.m_id)
+                       newwep = WEP_MACHINEGUN;
+               if(self.ok_lastwep == WEP_RPC.m_id)
+                       newwep = WEP_VORTEX;
+               PS(self).m_switchweapon = newwep;
+               LOG_INFO("Overkill PlayerPreThink weapon setting at time ", ftos(time), "\n");
                self.ok_lastwep = 0;
        }