Merge branch 'master' into Mario/entrap_nade

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

diff --git a/qcsrc/common/viewloc.qc b/qcsrc/common/viewloc.qc
index f67bbc88796122b20d5d9c0bcf40a2ef10647cde..23b30792229f7e1e02f2720461e6fabb2720e644 100644 (file)
--- a/qcsrc/common/viewloc.qc
+++ b/qcsrc/common/viewloc.qc
@@ -45,9 +45,9 @@ void viewloc_PlayerPhysics(entity this)
 
                //if(!PHYS_INPUT_BUTTON_CROUCH(this) && !IS_DUCKED(this))
 #ifdef SVQC
-                       //this.BUTTON_CROUCH = (old_movement_x < 0);
+                       //PHYS_INPUT_BUTTON_CROUCH(this) = (old_movement_x < 0);
                        if (old_movement.x < 0)
-                               this.BUTTON_CROUCH = true;
+                               PHYS_INPUT_BUTTON_CROUCH(this) = true;
 #elif defined(CSQC)
                        if (old_movement.x < 0)
                        {
@@ -64,13 +64,13 @@ void viewloc_PlayerPhysics(entity this)
 void viewloc_SetTags(entity this)
 {
        if(this.viewloc && wasfreed(this.viewloc))
-               this.viewloc = world;
+               this.viewloc = NULL;
 
        if(this.viewloc.entnum != this.tag_networkviewloc)
        if(this.tag_networkviewloc == 0)
-               this.viewloc = world;
+               this.viewloc = NULL;
        else
-               this.viewloc = findfloat(world, entnum, this.tag_networkviewloc);
+               this.viewloc = findfloat(NULL, entnum, this.tag_networkviewloc);
 }
 
 vector old_camera_angle = '0 0 0';