From: Mario <mario@smbclan.net>
Date: Wed, 3 Aug 2016 01:04:38 +0000 (+1000)
Subject: Fix references to .movetype
X-Git-Tag: xonotic-v0.8.2~757
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=66c35afc0817c6fdbd1966006735864f8b2d62d3;p=xonotic%2Fxonotic-data.pk3dir.git

Fix references to .movetype
---

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index f1553f2f1..aac321813 100644
--- 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 0df3411c1..fe053a22e 100644
--- 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;
 	}
 }