Apply a hack to fix being unable to switch weapons while dead in overkill, while...

[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 2dc6e841446f54ddaa9939ddc153eda930bf6142..125025f205c40f8ce1908705ff831df50d18a252 100644 (file)
--- a/qcsrc/common/mutators/mutator/overkill/overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc
@@ -188,7 +188,6 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
                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;
        }
 
@@ -257,6 +256,10 @@ MUTATOR_HOOKFUNCTION(ok, PlayerSpawn)
        else
                self.ok_use_ammocharge = 0;
 
+       // if player changed their weapon while dead, don't switch to their death weapon
+       if(self.impulse)
+               self.ok_lastwep = 0;
+
        self.ok_pauseregen_finished = time + 2;
 
        return false;