Merge remote branch 'origin/akari/freezetag-fixes'

diff --combined qcsrc/server/mutators/gamemode_freezetag.qc
index 4cddbbc70fbb74608645299b7bf36724047e2c32,8fbefbd9386abaf52d1322bec79e30a7cb05f134..f56dc59f18f15979d5cdd8e5defb06826babdaf9
--- 1/qcsrc/server/mutators/gamemode_freezetag.qc
--- 2/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@@ -85,6 -85,8 +85,8 @@@ void freezetag_Freeze(entity attacker
        freezetag_Ice_Think();
        self = oldself;
  
+       RemoveGrapplingHook(self);
+ 
        // add waypoint
        WaypointSprite_Spawn("freezetag_frozen", 0, 0, self, '0 0 64', world, self.team, self, waypointsprite_attached, TRUE);
        if(self.waypointsprite_attached)
@@@ -326,13 -328,6 +328,13 @@@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDa
      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);
@@@ -343,7 -338,6 +345,7 @@@
        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
        {