Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / vehicles / vehicles.qc

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 75fa9407e6858b05393a4bdb5ce749f2bc99ec12..7226fe5679be74bd90b1122c8ad6dc79859f7bb4 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;
@@ -583,6 +586,9 @@ void vehicles_enter()
 
     if(self.phase > time)
         return;
+               
+       if(other.frozen)
+               return;
 
     if(teamplay)
     if(self.team)
@@ -636,6 +642,7 @@ void vehicles_enter()
 
     self.team                 = self.owner.team;
     self.flags               -= FL_NOTARGET;
+       self.monster_attack               = TRUE;
     
     if (IS_REAL_CLIENT(other))
     {
@@ -813,6 +820,7 @@ void vehicles_exit(float eject)
     sound (_vehicle, CH_TRIGGER_SINGLE, "misc/null.wav", 1, ATTEN_NORM);
     _vehicle.vehicle_hudmodel.viewmodelforclient = _vehicle;   
     _vehicle.phase = time + 1;
+       _vehicle.monster_attack = FALSE;
     
     _vehicle.vehicle_exit(eject);