Clean out some more self uses from vehicle code

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

diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc
index 7ec82cc67265ab6cc6bbc2e56b8c88912d5fe46e..f3670a839e59b4b6ec5c1e756df3608f204fe483 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/racer.qc
+++ b/qcsrc/common/vehicles/vehicle/racer.qc
@@ -1,7 +1,7 @@
 #ifndef VEHICLE_RACER
 #define VEHICLE_RACER
 
-#include "racer_weapon.qc"
+#include "racer_weapon.qh"
 
 CLASS(Racer, Vehicle)
 /* spawnflags */ ATTRIB(Racer, spawnflags, int, VHF_DMGSHAKE | VHF_DMGROLL);
@@ -26,8 +26,6 @@ REGISTER_VEHICLE(RACER, NEW(Racer));
 
 #ifdef IMPLEMENTATION
 
-#include "racer_weapon.qc"
-
 #ifdef SVQC
 #include <common/triggers/trigger/impulse.qh>
 
@@ -311,6 +309,8 @@ bool racer_frame(entity this)
        this.movement = vehic.velocity += df * PHYS_INPUT_TIMELENGTH;
 
 #ifdef SVQC
+       setself(vehic);
+
        Weapon wep1 = WEP_RACER;
        if (!forbidWeaponUse(this))
        if (PHYS_INPUT_BUTTON_ATCK(this))
@@ -329,6 +329,8 @@ bool racer_frame(entity this)
                wep1.wr_think(wep1, vehic, weaponentity, 1);
        }
 
+       setself(this);
+
        if(autocvar_g_vehicle_racer_rocket_locktarget)
        {
                vehicles_locktarget(vehic, (1 / autocvar_g_vehicle_racer_rocket_locking_time) * frametime,