From: terencehill Date: Sat, 15 Jan 2011 19:15:47 +0000 (+0100) Subject: Fix frozen player can throw the weapon in this verified case: place some electro... X-Git-Tag: xonotic-v0.5.0~316^2~4^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb6c254db06125c5f1f18f34d5def0b4584a021b;p=xonotic%2Fxonotic-data.pk3dir.git Fix frozen player can throw the weapon in this verified case: place some electro balls sufficient to kill yourself, switch to the shotgun and go kill yourself by going over the balls --- diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index d09bbeecf..4cddbbc70 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -326,6 +326,13 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDamage_Calculate) return 1; } +MUTATOR_HOOKFUNCTION(freezetag_ForbidThrowCurrentWeapon) +{ + if (self.freezetag_frozen) + return 1; + return 0; +} + MUTATOR_DEFINITION(gamemode_freezetag) { MUTATOR_HOOK(MakePlayerObserver, freezetag_RemovePlayer, CBC_ORDER_ANY); @@ -336,6 +343,7 @@ MUTATOR_DEFINITION(gamemode_freezetag) MUTATOR_HOOK(PlayerPreThink, freezetag_PlayerPreThink, CBC_ORDER_FIRST); MUTATOR_HOOK(PlayerPhysics, freezetag_PlayerPhysics, CBC_ORDER_FIRST); MUTATOR_HOOK(PlayerDamage_Calculate, freezetag_PlayerDamage_Calculate, CBC_ORDER_ANY); + MUTATOR_HOOK(ForbidThrowCurrentWeapon, freezetag_ForbidThrowCurrentWeapon, CBC_ORDER_FIRST); //first, last or any? dunno. MUTATOR_ONADD {