Merge branch 'master' into Mario/hagar_notfixed

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / viewloc.qc

diff --git a/qcsrc/common/viewloc.qc b/qcsrc/common/viewloc.qc
index 0ad4d338218c07b4779c739a530385caf1b3ec8f..fb510f8564ba50a59f63edaced5b89ed7a157197 100644 (file)
--- a/qcsrc/common/viewloc.qc
+++ b/qcsrc/common/viewloc.qc
@@ -13,8 +13,8 @@ void viewloc_PlayerPhysics(entity this)
 {
        if(this.viewloc)
        {
-               vector oldmovement = this.movement;
-               this.movement_x = oldmovement_y;
+               vector old_movement = this.movement;
+               this.movement_x = old_movement_y;
                this.movement_y = 0;
 
                if(this.movement_x < 0)
@@ -32,12 +32,12 @@ void viewloc_PlayerPhysics(entity this)
                if(this.movement_x > 0) // right
                        this.angles_y = forward_y;
 
-               if(oldmovement_x > 0)
+               if(old_movement_x > 0)
 #ifdef CSQC
                        input_angles_x =
 #endif
                        this.v_angle_x = this.angles_x = -50;
-               else if(oldmovement_x < 0)
+               else if(old_movement_x < 0)
 #ifdef CSQC
                        input_angles_x =
 #endif
@@ -45,11 +45,11 @@ void viewloc_PlayerPhysics(entity this)
 
                //if(!PHYS_INPUT_BUTTON_CROUCH(this) && !IS_DUCKED(this))
 #ifdef SVQC
-                       //this.BUTTON_CROUCH = (oldmovement_x < 0);
-                       if (oldmovement.x < 0)
-                               this.BUTTON_CROUCH = true;
+                       //PHYS_INPUT_BUTTON_CROUCH(this) = (old_movement_x < 0);
+                       if (old_movement.x < 0)
+                               PHYS_INPUT_BUTTON_CROUCH(this) = true;
 #elif defined(CSQC)
-                       if (oldmovement.x < 0)
+                       if (old_movement.x < 0)
                        {
                                input_buttons |= BIT(4);
                                this.flags |= FL_DUCKED;
@@ -61,16 +61,16 @@ void viewloc_PlayerPhysics(entity this)
 
 #ifdef CSQC
 
-void viewloc_SetTags()
-{SELFPARAM();
-       if(self.viewloc && wasfreed(self.viewloc))
-               self.viewloc = world;
+void viewloc_SetTags(entity this)
+{
+       if(this.viewloc && wasfreed(this.viewloc))
+               this.viewloc = world;
 
-       if(self.viewloc.entnum != self.tag_networkviewloc)
-       if(self.tag_networkviewloc == 0)
-               self.viewloc = world;
+       if(this.viewloc.entnum != this.tag_networkviewloc)
+       if(this.tag_networkviewloc == 0)
+               this.viewloc = world;
        else
-               self.viewloc = findfloat(world, entnum, self.tag_networkviewloc);
+               this.viewloc = findfloat(world, entnum, this.tag_networkviewloc);
 }
 
 vector old_camera_angle = '0 0 0';