Merge remote branch 'origin/master' into samual/mutator_ctf

[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 d9d77b5f5211957f539c4ee41b1057beec0980a4..2aeab39500c3448be59540076eb9349d4a9a6349 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -497,6 +497,7 @@ void vehicles_enter()
 
     CSQCVehicleSetup(self.owner, self.hud);
     
+    /* FIXCTF // THIS IS A BIG NO-NO, NO GAME MODE SPECIFIC CODE IN VEHICLES.
     if(other.flagcarried)
     {
         if(!autocvar_g_vehicles_allow_flagcarry)
@@ -508,6 +509,7 @@ void vehicles_enter()
             setorigin(other, '0 0 96');
         }
     }
+    */
     
     self.vehicle_enter();
 }
@@ -621,12 +623,14 @@ void vehicles_exit(float eject)
     else
         self.team = self.tur_head.team;
     
+    /* FIXCTF // THIS IS A BIG NO-NO, NO GAME MODE SPECIFIC CODE IN VEHICLES.
     if(self.owner.flagcarried)
     {
         self.owner.flagcarried.scale = 0.6;
         setattachment(self.owner.flagcarried, self.owner, ""); 
         setorigin(self.owner.flagcarried, FLAG_CARRY_POS);
     }
+    */
     
     sound (self, CH_TRIGGER_SINGLE, "misc/null.wav", 1, ATTN_NORM);
     self.vehicle_exit(eject);