Merge branch 'master' into TimePath/global_self

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

diff --git a/qcsrc/common/vehicles/unit/raptor.qc b/qcsrc/common/vehicles/unit/raptor.qc
index 14da2b3207c0992b791fa76a4065b2060aeaeecd..263da161f0d197ce6d1bfaf8c9481d220613336c 100644 (file)
--- a/qcsrc/common/vehicles/unit/raptor.qc
+++ b/qcsrc/common/vehicles/unit/raptor.qc
@@ -320,7 +320,7 @@ float raptor_frame()
 
        player = self;
        raptor = self.vehicle;
-       self   = raptor;
+       setself(raptor);
 
        vehicles_painframe();
        /*
@@ -349,7 +349,7 @@ float raptor_frame()
 
        if(raptor.deadflag != DEAD_NO)
        {
-               self = player;
+               setself(player);
                player.BUTTON_ATCK = player.BUTTON_ATCK2 = 0;
                return 1;
        }
@@ -642,7 +642,7 @@ float raptor_frame()
 
        player.BUTTON_ATCK = player.BUTTON_ATCK2 = player.BUTTON_CROUCH = 0;
 
-       self = player;
+       setself(player);
        return 1;
 }
 
@@ -652,7 +652,7 @@ float raptor_takeoff()
 
        player = self;
        raptor = self.vehicle;
-       self   = raptor;
+       setself(raptor);
 
        self.nextthink = time;
        CSQCMODEL_AUTOUPDATE(self);
@@ -698,7 +698,7 @@ float raptor_takeoff()
                VEHICLE_UPDATE_PLAYER(player, shield, raptor);
 
        player.BUTTON_ATCK = player.BUTTON_ATCK2 = player.BUTTON_CROUCH = 0;
-       self = player;
+       setself(player);
        return 1;
 }