]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Move VehicleTouch to the correct function
authorMario <mario.mario@y7mail.com>
Fri, 17 May 2013 01:28:32 +0000 (11:28 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 17 May 2013 01:28:32 +0000 (11:28 +1000)
qcsrc/server/vehicles/vehicles.qc

index dc78b054553c67f9893e4bc2db791a55a323664e..1e78bd5a28eec14fc7cffa9f5e9703ccffd09bc6 100644 (file)
@@ -537,6 +537,9 @@ void vehilces_impact(float _minspeed, float _speedfac, float _maxpain)
 .void() vehicle_impact;
 void vehicles_touch()
 {
+       if(MUTATOR_CALLHOOK(VehicleTouch))
+               return;
+       
     // Vehicle currently in use
     if(self.owner)
     {
@@ -585,9 +588,6 @@ void vehicles_enter()
     if(self.team)
     if(self.team != other.team)
         return;
-               
-       if(MUTATOR_CALLHOOK(VehicleTouch))
-               return;
 
     RemoveGrapplingHook(other);