Fix references to .movetype

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index f1553f2f130c7e4f2f6f07098ac2a84242b84cd4..aac32181318a2f24928b9cb88651af3e2031c33b 100644 (file)
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -245,7 +245,7 @@ STATIC_INIT(PHYS_INPUT_BUTTON_JETPACK)
 #elif defined(SVQC)
 
        #define PHYS_FIXANGLE(s) ((s).fixangle)
-       #define PHYS_MOVETYPE(s) ((s).movetype)
+       #define PHYS_MOVETYPE(s) ((s).move_movetype)
 
        bool Physics_Valid(string thecvar);
 

diff --git a/qcsrc/ecs/systems/sv_physics.qc b/qcsrc/ecs/systems/sv_physics.qc
index 0df3411c1d37be4b62ae0ca2aa4db0ad6b0ba3f0..fe053a22eda17f17443e09ff2a5a34f415bcd49e 100644 (file)
--- a/qcsrc/ecs/systems/sv_physics.qc
+++ b/qcsrc/ecs/systems/sv_physics.qc
@@ -40,10 +40,10 @@ void sys_phys_pregame_hold(entity this)
        const bool allowed_to_move = (time >= game_starttime);
        if (!allowed_to_move) {
                this.velocity = '0 0 0';
-               this.movetype = MOVETYPE_NONE;
+               set_movetype(this, MOVETYPE_NONE);
                this.disableclientprediction = 2;
        } else if (this.disableclientprediction == 2) {
-               if (this.movetype == MOVETYPE_NONE) { this.movetype = MOVETYPE_WALK; }
+               if (this.move_movetype == MOVETYPE_NONE) { set_movetype(this, MOVETYPE_WALK); }
                this.disableclientprediction = 0;
        }
 }