]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ba4c69d)
Nades: don't forget to think
authorTimePath <andrew.hardaker1995@gmail.com>
Tue, 13 Oct 2015 07:52:58 +0000 (18:52 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Tue, 13 Oct 2015 07:53:20 +0000 (18:53 +1100)
Closes #1571

qcsrc/server/mutators/mutator_nades.qc patch | blob | history

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index f665fbc13576a7fcf9ebb3a7d05f2a1004dcf603..1b4b7ddc569901da334f6cf4989a6d2e666fdc9b 100644 (file)
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -964,7 +964,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerPreThink)
 {SELFPARAM();
        if (!IS_PLAYER(self)) { return false; }
 
-       if (self.nade && self.offhand != OFFHAND_NADE) OFFHAND_NADE.offhand_think(OFFHAND_NADE, self, self.nade_altbutton);
+       if (self.nade && (self.offhand != OFFHAND_NADE || (self.weapons & WEPSET(HOOK)))) OFFHAND_NADE.offhand_think(OFFHAND_NADE, self, self.nade_altbutton);
 
        if(IS_PLAYER(self))
        {