From: Mario <mario.mario@y7mail.com>
Date: Sun, 26 May 2013 15:34:25 +0000 (+1000)
Subject: Add frozen vehicle fix to main vehicle code
X-Git-Tag: xonotic-v0.8.0~241^2^2~220
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0a1c8b1ff5343c7e568f6f75db8aa0f3e5148901;p=xonotic%2Fxonotic-data.pk3dir.git

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 14a8a6b37..5e83a8c4a 100644
--- 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 93fbe1064..5dfaf0f09 100644
--- 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;