Set self in vehicle frames as before (until we can purify weapon functions), fixes...

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

diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc
index c13ec3eafa818485cb3de68df5e5af306d578a35..6fee43d4e7b9f384083464223d17557aab1cd875 100644 (file)
--- a/qcsrc/common/vehicles/vehicle/raptor.qc
+++ b/qcsrc/common/vehicles/vehicle/raptor.qc
@@ -170,6 +170,8 @@ bool raptor_frame(entity this)
                return;
        }
 
+       setself(vehic);
+
        vehicles_frame(vehic, this);
 
        float ftmp = 0;
@@ -200,7 +202,7 @@ bool raptor_frame(entity this)
        if(IS_DEAD(vehic))
        {
                PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_ATCK2(this) = false;
-               return 1;
+               return;
        }
        crosshair_trace(this);
 
@@ -460,6 +462,8 @@ bool raptor_frame(entity this)
                VEHICLE_UPDATE_PLAYER(this, vehic, shield, raptor);
 
        PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_ATCK2(this) = PHYS_INPUT_BUTTON_CROUCH(this) = false;
+
+       setself(this);
 }
 
 bool raptor_takeoff(entity this)
@@ -467,6 +471,8 @@ bool raptor_takeoff(entity this)
        entity vehic = this.vehicle;
        return = true;
 
+       setself(this);
+
        vehic.nextthink = time;
        CSQCMODEL_AUTOUPDATE(vehic);
        vehic.nextthink = 0; // will this work?
@@ -511,6 +517,8 @@ bool raptor_takeoff(entity this)
                VEHICLE_UPDATE_PLAYER(this, vehic, shield, raptor);
 
        PHYS_INPUT_BUTTON_ATCK(this) = PHYS_INPUT_BUTTON_ATCK2(this) = PHYS_INPUT_BUTTON_CROUCH(this) = false;
+
+       setself(vehic);
 }
 
 void raptor_blowup()