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 bc2e961605ef6815281408431e32faf5b33e6719..070a0492a3e4e5c79fe795bf3c06b072faf375a9 100644 (file)
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -197,12 +197,16 @@ 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()
 {
-    float hgt;
 
+    float hgt;
+    
     hgt = raptor_altitude(512);
     self.velocity = (self.velocity * 0.9) + ('0 0 -1800' * (hgt / 256) * sys_frametime);
     self.angles_x *= 0.95;
@@ -312,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) 
@@ -340,15 +348,8 @@ 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)
     {
         self = player;
@@ -423,9 +424,9 @@ float raptor_frame()
         df +=  v_up * autocvar_g_vehicle_raptor_speed_up;
 
     raptor.velocity  += df * frametime;
-    //player.velocity = player.movement  = raptor.velocity;
-    player.velocity = raptor.velocity;
-    //setorigin(player,raptor.origin + '0 0 32');
+    //player.velocity = raptor.velocity;
+    player.velocity = player.movement  = raptor.velocity;
+    setorigin(player, raptor.origin + '0 0 32');
 
     vector vf, ad;
     // Target lock & predict
@@ -473,10 +474,16 @@ float raptor_frame()
 
     // Gun1
     df = gettaginfo(raptor.gun1, gettagindex(raptor.gun1, "fire1"));
-    //ad = df;
-    //vf = v_forward;
-    df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle
-    df = shortangle_vxy(df - (ra + raptor.gun1.angles), ra + raptor.gun1.angles);     // Find aim offset
+    ad = df;
+    vf = v_forward;
+    //if(self.lock_strength == 1)
+    //{
+        df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle
+        df = shortangle_vxy(df - (ra + raptor.gun1.angles), ra + raptor.gun1.angles);     // Find aim offset        
+    //}
+    //else    
+    //    df = '0 0 0';
+        
     // Bind to aimspeed
     df_x = bound(ftmp, df_x, ftmp2);
     df_y = bound(ftmp, df_y, ftmp2);
@@ -484,14 +491,18 @@ float raptor_frame()
     raptor.gun1.angles_x = bound(-autocvar_g_vehicle_raptor_cannon_pitchlimit_down, df_x + raptor.gun1.angles_x, autocvar_g_vehicle_raptor_cannon_pitchlimit_up);
     raptor.gun1.angles_y = bound(-autocvar_g_vehicle_raptor_cannon_turnlimit,  df_y + raptor.gun1.angles_y, autocvar_g_vehicle_raptor_cannon_turnlimit);
 
-    //df = vectoangles(normalize(trace_endpos - df));
-
-    //Gun 2
+    // Gun2
     df = gettaginfo(raptor.gun2, gettagindex(raptor.gun2, "fire1"));
-    //ad += df;
-    //vf += v_forward;
-    df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle
-    df = shortangle_vxy(df - (ra + raptor.gun2.angles), ra + raptor.gun2.angles);     // Find aim offset
+    ad += df;
+    vf += v_forward;
+    //if(self.lock_strength == 1)
+    //{
+        df = vectoangles(normalize(trace_endpos - df)); // Find the direction & angle
+        df = shortangle_vxy(df - (ra + raptor.gun2.angles), ra + raptor.gun2.angles);     // Find aim offset        
+    //}
+    //else    
+    //    df = '0 0 0';
+        
     // Bind to aimspeed
     df_x = bound(ftmp, df_x, ftmp2);
     df_y = bound(ftmp, df_y, ftmp2);
@@ -505,7 +516,7 @@ float raptor_frame()
     traceline(ad, ad + v_forward * MAX_SHOT_DISTANCE, MOVE_NORMAL, raptor);
     UpdateAuxiliaryXhair(player, trace_endpos, '0 1 0', 0);
     */
-
+    
     if(player.BUTTON_ATCK)
     if(raptor.attack_finished_single <= time)
     if(raptor.vehicle_energy > autocvar_g_vehicle_raptor_cannon_cost)
@@ -728,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;