Fixed issue where m_MoveState was redefined in inheriting class, causing problems

Author: Causeless

CHANGELOG.md

@@ -95,6 +95,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed a bug in Harvester and Massacre where setting deploy units would auto-assign units of the wrong tech.
 
+- Fixed an issue where an `Actor`'s MovementState wasn't correctly accessible from script.
+
 </details>
 
 <details><summary><b>Removed</b></summary>

Source/Entities/ACraft.cpp

@@ -180,7 +180,7 @@ MOSRotating* ACraft::Exit::SuckInMOs(ACraft* pExitOwner) {
 void ACraft::Clear() {
 	m_AIMode = AIMODE_DELIVER;
 
-	m_MoveState = 0;
+	m_MoveState = NOMOVE;
 	m_HatchState = CLOSED;
 	m_HatchTimer.Reset();
 	m_HatchDelay = 0;

Source/Entities/ACraft.h

@@ -323,8 +323,6 @@ namespace RTE {
 	protected:
 		// Member variables
 		static Entity::ClassInfo m_sClass;
-		// Current movement state.
-		unsigned int m_MoveState;
 		// Current hatch action state.
 		unsigned int m_HatchState;
 		// Timer for opening and closing hatches

Source/Entities/AHuman.cpp

@@ -1484,16 +1484,19 @@ void AHuman::PreControllerUpdate() {
 
 	if (!keepOldState) {
 		bool prone = m_Controller.IsState(BODY_PRONE);
+
 		// Engage prone state, this makes the body's rotational spring pull it horizontal instead of upright.
 		if (prone && m_ProneState == NOTPRONE) {
 			m_ProneState = GOPRONE;
 			m_ProneTimer.Reset();
 		}
+
 		if ((m_Controller.IsState(MOVE_RIGHT) || m_Controller.IsState(MOVE_LEFT) || m_MoveState == JUMP) && m_Status != INACTIVE) {
 			for (int i = WALK; i < MOVEMENTSTATECOUNT; ++i) {
 				m_Paths[FGROUND][i].SetHFlip(m_HFlipped);
 				m_Paths[BGROUND][i].SetHFlip(m_HFlipped);
 			}
+
 			// Only if not jumping, OR if jumping, and apparently stuck on something - then help out with the limbs.
 			if (m_MoveState != JUMP || isStill) {
 				MovementState oldMoveState = m_MoveState;

Source/Entities/AHuman.h

@@ -597,8 +597,6 @@ namespace RTE {
 		Timer m_IconBlinkTimer;
 		// Current upper body state.
 		UpperBodyState m_ArmsState;
-		// Current movement state.
-		MovementState m_MoveState;
 		// Whether the guy is currently lying down on the ground, rotational spring pulling him that way
 		// This is engaged if the player first crouches (still upright spring), and then presses left/right
 		// It is disengaged as soon as the crouch button/direction is released

Source/Lua/LuaBindingsEntities.cpp

@@ -179,6 +179,7 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, Actor) {
 	    .property("CanRun", &Actor::GetCanRun, &Actor::SetCanRun)
 	    .property("CrouchWalkSpeedMultiplier", &Actor::GetCrouchWalkSpeedMultiplier, &Actor::SetCrouchWalkSpeedMultiplier)
 	    .property("Status", &Actor::GetStatus, &Actor::SetStatus)
+	    .property("MovementState", &Actor::GetMovementState, &Actor::SetMovementState)
 	    .property("Health", &Actor::GetHealth, &Actor::SetHealth)
 	    .property("PrevHealth", &Actor::GetPrevHealth)
 	    .property("MaxHealth", &Actor::GetMaxHealth, &Actor::SetMaxHealth)
@@ -413,7 +414,6 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, AHuman) {
 	    .property("CrouchAmountOverride", &AHuman::GetCrouchAmountOverride, &AHuman::SetCrouchAmountOverride)
 	    .property("StrideSound", &AHuman::GetStrideSound, &LuaAdaptersPropertyOwnershipSafetyFaker::AHumanSetStrideSound)
 	    .property("UpperBodyState", &AHuman::GetUpperBodyState, &AHuman::SetUpperBodyState)
-	    .property("MovementState", &AHuman::GetMovementState, &AHuman::SetMovementState)
 	    .property("ProneState", &AHuman::GetProneState, &AHuman::SetProneState)
 	    .property("ThrowPrepTime", &AHuman::GetThrowPrepTime, &AHuman::SetThrowPrepTime)
 	    .property("ThrowProgress", &AHuman::GetThrowProgress)