Fix intermission (sort of, will be better once vehicle hud is made a panel)

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

diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index 65ac2c977fe22a3bb4be6fb00178a901e1f94206..070a0492a3e4e5c79fe795bf3c06b072faf375a9 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -197,6 +197,9 @@ void raptor_enter()
     self.delay = time + autocvar_g_vehicle_raptor_bombs_refire;
     self.lip   = time;
 
+    if(self.owner.flagcarried)
+       setorigin(self.owner.flagcarried, '-20 0 96');
+
 }
 
 void raptor_land()
@@ -313,11 +316,15 @@ float raptor_frame()
     entity player, raptor;
     float ftmp, ftmp2;
     vector df, ra;
+    
+       if(intermission_running)
+               return;
 
     player = self;
     raptor = self.vehicle;
     self   = raptor;
-        
+    
+    vehicles_painframe();
     /*
     ftmp = vlen(self.velocity);
     if(ftmp > autocvar_g_vehicle_raptor_speed_forward) 
@@ -341,16 +348,7 @@ float raptor_frame()
         self.wait = ftmp;
     }
     */
-    
-    /*
-    if(player.BUTTON_USE && raptor.deadflag == DEAD_NO)
-    {
-        self = raptor;
-        vehicles_exit(VHEF_NORMAL);
-        self = player;
-        return 0;
-    }    
-    */
+
     
     if(raptor.deadflag != DEAD_NO)
     {
@@ -741,7 +739,10 @@ void raptor_dinit()
 void spawnfunc_vehicle_raptor()
 {
     vehicles_configcheck("vehicle_raptor.cfg", autocvar_g_vehicle_raptor_health);
-    
+
+    self.vehicle_flags |= VHF_DMGSHAKE;
+    self.vehicle_flags |= VHF_DMGROLL;
+   
     if(autocvar_g_vehicle_raptor_shield)
         self.vehicle_flags |= VHF_HASSHIELD;