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 20c74d3a17e24deb0012882c634c9d527d4747d0..97784315d1f0ba14e33cfca06913c0b8811e3ceb 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -520,6 +520,7 @@ void vehicles_enter()
 
     CSQCVehicleSetup(self.owner, self.hud);
     
 
     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)
     if(other.flagcarried)
     {
         if(!autocvar_g_vehicles_allow_flagcarry)


@@ -531,6 +532,7 @@ void vehicles_enter()
             setorigin(other, '0 0 96');
         }
     }
             setorigin(other, '0 0 96');
         }
     }

+    */

     
     self.vehicle_enter();
     antilag_clear(other);
     
     self.vehicle_enter();
     antilag_clear(other);


@@ -647,12 +649,14 @@ void vehicles_exit(float eject)
     else
         self.team = self.tur_head.team;
     
     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);
     }
     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);
     
     sound (self, CH_TRIGGER_SINGLE, "misc/null.wav", 1, ATTN_NORM);
     self.vehicle_exit(eject);