Attach flagcarries flag to vehicle, scale up and position flag when carried by vehicle

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

diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index 4abeecf21596d367bfcb881d22c0f085d55a425d..f62925f299b659efdc671b89a7bc28f607477335 100644 (file)
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -263,13 +263,15 @@ float racer_frame()
 
     self = racer;
 
+    /*
     if(player.BUTTON_USE)
     {
         vehicles_exit(VHEF_NORMAL);
         self = player;
         return 0;
     }
-
+    */
+    
     if(racer.deadflag != DEAD_NO)
     {
         self = player;
@@ -409,7 +411,7 @@ float racer_frame()
     if(player.BUTTON_ATCK2)
     {
         self.misc_bulletcounter += 1;
-        racer.delay = time + 0.2;
+        racer.delay = time + 0.3;
         if(self.misc_bulletcounter == 1)
             racer_fire_rocket("tag_rocket_r", (self.lock_strength == 1 && self.lock_target) ? self.lock_target : world);
         else if(self.misc_bulletcounter == 2)
@@ -485,6 +487,9 @@ void racer_enter()
     self.movetype = MOVETYPE_BOUNCE;
     self.owner.vehicle_health = (self.vehicle_health / autocvar_g_vehicle_racer_health);
     self.owner.vehicle_shield = (self.vehicle_shield / autocvar_g_vehicle_racer_shield);
+    
+    if(self.owner.flagcarried)
+       setorigin(self.owner.flagcarried, '-190 0 96');
 }
 
 void racer_exit(float eject)