Removed a bunch of legacy code

Causeless · Causeless · commit f1085a9ea6b1 · 2024-09-20T20:12:53.000+01:00
diff --git a/Source/Entities/ACrab.cpp b/Source/Entities/ACrab.cpp
@@ -62,21 +62,6 @@ void ACrab::Clear() {
 		//        m_StrideTimer[side].Reset();
 	}
 	m_Aiming = false;
-
-	m_DeviceState = SCANNING;
-	m_SweepState = NOSWEEP;
-	m_DigState = NOTDIGGING;
-	m_JumpState = NOTJUMPING;
-	m_JumpTarget.Reset();
-	m_JumpingRight = true;
-	m_DigTunnelEndPos.Reset();
-	m_SweepCenterAimAngle = 0;
-	m_SweepRange = c_EighthPI;
-	m_DigTarget.Reset();
-	m_FireTimer.Reset();
-	m_SweepTimer.Reset();
-	m_PatrolTimer.Reset();
-	m_JumpTimer.Reset();
 	m_AimRangeUpperLimit = -1;
 	m_AimRangeLowerLimit = -1;
 	m_LockMouseAimInput = false;
@@ -229,15 +214,6 @@ int ACrab::Create(const ACrab& reference) {
 		}
 	}
 
-	m_DeviceState = reference.m_DeviceState;
-	m_SweepState = reference.m_SweepState;
-	m_DigState = reference.m_DigState;
-	m_JumpState = reference.m_JumpState;
-	m_JumpTarget = reference.m_JumpTarget;
-	m_JumpingRight = reference.m_JumpingRight;
-	m_DigTunnelEndPos = reference.m_DigTunnelEndPos;
-	m_SweepCenterAimAngle = reference.m_SweepCenterAimAngle;
-	m_SweepRange = reference.m_SweepRange;
 	m_AimRangeUpperLimit = reference.m_AimRangeUpperLimit;
 	m_AimRangeLowerLimit = reference.m_AimRangeLowerLimit;
 	m_LockMouseAimInput = reference.m_LockMouseAimInput;
diff --git a/Source/Entities/ACrab.h b/Source/Entities/ACrab.h
@@ -321,74 +321,6 @@ namespace RTE {
 		float m_AimRangeUpperLimit;
 		// The maximum angle MountedMO can be aimed down, positive values only, in radians
 		float m_AimRangeLowerLimit;
-
-		////////////////
-		// AI States
-
-		enum DeviceHandlingState {
-			STILL = 0,
-			POINTING,
-			SCANNING,
-			AIMING,
-			FIRING,
-			THROWING,
-			DIGGING
-		};
-
-		enum SweepState {
-			NOSWEEP = 0,
-			SWEEPINGUP,
-			SWEEPUPPAUSE,
-			SWEEPINGDOWN,
-			SWEEPDOWNPAUSE
-		};
-
-		enum DigState {
-			NOTDIGGING = 0,
-			PREDIG,
-			STARTDIG,
-			TUNNELING,
-			FINISHINGDIG,
-			PAUSEDIGGER
-		};
-
-		enum JumpState {
-			NOTJUMPING = 0,
-			FORWARDJUMP,
-			PREUPJUMP,
-			UPJUMP,
-			APEXJUMP,
-			LANDJUMP
-		};
-
-		// What the AI is doing with its held devices
-		DeviceHandlingState m_DeviceState;
-		// What we are doing with a device sweeping
-		SweepState m_SweepState;
-		// The current digging state
-		DigState m_DigState;
-		// The current jumping state
-		JumpState m_JumpState;
-		// Jumping target, overshoot this and the jump is completed
-		Vector m_JumpTarget;
-		// Jumping left or right
-		bool m_JumpingRight;
-		// The position of the end of the current tunnel being dug. When it is reached, digging can stop.
-		Vector m_DigTunnelEndPos;
-		// The center angle (in rads) for the sweeping motion done duing scannign and digging
-		float m_SweepCenterAimAngle;
-		// The range to each direction of the center that the sweeping motion will be done in
-		float m_SweepRange;
-		// The absolute coordinates of the last detected gold deposits
-		Vector m_DigTarget;
-		// Timer for how long to be shooting at a seen enemy target
-		Timer m_FireTimer;
-		// Timer for how long to be shooting at a seen enemy target
-		Timer m_SweepTimer;
-		// Timer for how long to be patrolling in a direction
-		Timer m_PatrolTimer;
-		// Timer for how long to be firing the jetpack in a direction
-		Timer m_JumpTimer;
 		// Whether mouse input should be locked to the aim range, or whether we can "wander" out. For static emplacements like turrets, this is good, but for moving things it's a bit sticky.
 		bool m_LockMouseAimInput;
 
diff --git a/Source/Entities/AHuman.cpp b/Source/Entities/AHuman.cpp
@@ -84,22 +84,6 @@ void AHuman::Clear() {
 	m_WalkPathOffset.Reset();
 	m_ArmSwingRate = 1.0F;
 	m_DeviceArmSwayRate = 0.5F;
-
-	m_DeviceState = SCANNING;
-	m_SweepState = NOSWEEP;
-	m_DigState = NOTDIGGING;
-	m_JumpState = NOTJUMPING;
-	m_JumpTarget.Reset();
-	m_JumpingRight = true;
-	m_Crawling = false;
-	m_DigTunnelEndPos.Reset();
-	m_SweepCenterAimAngle = 0;
-	m_SweepRange = c_EighthPI;
-	m_DigTarget.Reset();
-	m_FireTimer.Reset();
-	m_SweepTimer.Reset();
-	m_PatrolTimer.Reset();
-	m_JumpTimer.Reset();
 }
 
 int AHuman::Create() {
@@ -238,17 +222,6 @@ int AHuman::Create(const AHuman& reference) {
 		m_Paths[BGROUND][RUN].SetBaseSpeedMultiplier(reference.m_Paths[BGROUND][WALK].GetSpeed(Speed::FAST) / reference.m_Paths[BGROUND][WALK].GetSpeed(Speed::NORMAL));
 	}
 
-	m_DeviceState = reference.m_DeviceState;
-	m_SweepState = reference.m_SweepState;
-	m_DigState = reference.m_DigState;
-	m_JumpState = reference.m_JumpState;
-	m_JumpTarget = reference.m_JumpTarget;
-	m_JumpingRight = reference.m_JumpingRight;
-	m_Crawling = reference.m_Crawling;
-	m_DigTunnelEndPos = reference.m_DigTunnelEndPos;
-	m_SweepCenterAimAngle = reference.m_SweepCenterAimAngle;
-	m_SweepRange = reference.m_SweepRange;
-
 	return 0;
 }
 
diff --git a/Source/Entities/AHuman.h b/Source/Entities/AHuman.h
@@ -638,76 +638,6 @@ namespace RTE {
 		float m_ArmSwingRate; //!< Controls the rate at which this AHuman's Arms follow the movement of its Legs while they're not holding device(s).
 		float m_DeviceArmSwayRate; //!< Controls the rate at which this AHuman's Arms follow the movement of its Legs while they're holding device(s). One-handed devices sway half as much as two-handed ones. Defaults to three quarters of Arm swing rate.
 
-		////////////////
-		// AI States
-
-		enum DeviceHandlingState {
-			STILL = 0,
-			POINTING,
-			SCANNING,
-			AIMING,
-			FIRING,
-			THROWING,
-			DIGGING
-		};
-
-		enum SweepState {
-			NOSWEEP = 0,
-			SWEEPINGUP,
-			SWEEPUPPAUSE,
-			SWEEPINGDOWN,
-			SWEEPDOWNPAUSE
-		};
-
-		enum DigState {
-			NOTDIGGING = 0,
-			PREDIG,
-			STARTDIG,
-			TUNNELING,
-			FINISHINGDIG,
-			PAUSEDIGGER
-		};
-
-		enum JumpState {
-			NOTJUMPING = 0,
-			FORWARDJUMP,
-			PREUPJUMP,
-			UPJUMP,
-			APEXJUMP,
-			LANDJUMP
-		};
-
-		// What the AI is doing with its held devices
-		DeviceHandlingState m_DeviceState;
-		// What we are doing with a device sweeping
-		SweepState m_SweepState;
-		// The current digging state
-		DigState m_DigState;
-		// The current jumping state
-		JumpState m_JumpState;
-		// Jumping target, overshoot this and the jump is completed
-		Vector m_JumpTarget;
-		// Jumping left or right
-		bool m_JumpingRight;
-		// AI is crawling
-		bool m_Crawling;
-		// The position of the end of the current tunnel being dug. When it is reached, digging can stop.
-		Vector m_DigTunnelEndPos;
-		// The center angle (in rads) for the sweeping motion done duing scannign and digging
-		float m_SweepCenterAimAngle;
-		// The range to each direction of the center that the sweeping motion will be done in
-		float m_SweepRange;
-		// The absolute coordinates of the last detected gold deposits
-		Vector m_DigTarget;
-		// Timer for how long to be shooting at a seen enemy target
-		Timer m_FireTimer;
-		// Timer for how long to be shooting at a seen enemy target
-		Timer m_SweepTimer;
-		// Timer for how long to be patrolling in a direction
-		Timer m_PatrolTimer;
-		// Timer for how long to be firing the jetpack in a direction
-		Timer m_JumpTimer;
-
 #pragma region Event Handling
 		/// Event listener to be run while this AHuman's PieMenu is opened.
 		/// @param pieMenu The PieMenu this event listener needs to listen to. This will always be this' m_PieMenu and only exists for std::bind.
