Add frozen vehicle fix to main vehicle code

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 14a8a6b37ef7fbceb6fbf8f0f4aa881ce03e8358..5e83a8c4a8d23945b4f3ed00bf5e8e78759169bf 100644 (file)
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -517,14 +517,6 @@ MUTATOR_HOOKFUNCTION(freezetag_GetTeamCount)
        return 0;
 }
 
-MUTATOR_HOOKFUNCTION(freezetag_VehicleTouch)
-{
-       if(other.frozen)
-               return TRUE;
-               
-       return FALSE;
-}
-
 void freezetag_Initialize()
 {
        precache_model("models/ice/ice.md3");
@@ -552,7 +544,6 @@ MUTATOR_DEFINITION(gamemode_freezetag)
        MUTATOR_HOOK(HavocBot_ChooseRule, freezetag_BotRoles, CBC_ORDER_ANY);
        MUTATOR_HOOK(SpectateCopy, freezetag_SpectateCopy, CBC_ORDER_ANY);
        MUTATOR_HOOK(GetTeamCount, freezetag_GetTeamCount, CBC_ORDER_EXCLUSIVE);
-       MUTATOR_HOOK(VehicleTouch, freezetag_VehicleTouch, CBC_ORDER_ANY);
 
        MUTATOR_ONADD
        {

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 93fbe1064575c840b45a8ca1bbfe44e960b276da..5dfaf0f0955cf292a7ec23ca4b37d812d0c73bcf 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -564,6 +564,9 @@ void vehicles_touch()
 
     if(other.deadflag != DEAD_NO)
         return;
+               
+       if(other.frozen)
+               return;
 
     if(other.vehicle != world)
         return;