From 816589d872112288b69e1382d7ad2a24b3742231 Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Mon, 29 Jul 2024 10:23:08 +0200 Subject: [PATCH] Server: set correct enum types for AI class members --- src/game/server/ai_movetypes.h | 10 +++++----- src/game/server/ai_navigator.h | 4 ++-- src/game/server/ai_route.h | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/game/server/ai_movetypes.h b/src/game/server/ai_movetypes.h index be1d0afa..8034cf0c 100644 --- a/src/game/server/ai_movetypes.h +++ b/src/game/server/ai_movetypes.h @@ -19,11 +19,11 @@ class CAI_Path; struct MovementTurn { - int turnAct; - int sequence; - float forwardDistance; - float perpendicularDistance; - float forwardMoveAdjust; + sharedactivity_e turnAct; + int sequence; + float forwardDistance; + float perpendicularDistance; + float forwardMoveAdjust; }; static_assert(sizeof(MovementTurn) == 0x14); diff --git a/src/game/server/ai_navigator.h b/src/game/server/ai_navigator.h index 932c65c5..e2752238 100644 --- a/src/game/server/ai_navigator.h +++ b/src/game/server/ai_navigator.h @@ -50,8 +50,8 @@ private: char m_utilityPath[32]; CAI_WaypointList* m_pClippedWaypoints; float m_flTimeClipped; - int m_PreviousMoveActivity; - int m_PreviousArrivalActivity; + sharedactivity_e m_PreviousMoveActivity; + sharedactivity_e m_PreviousArrivalActivity; int m_moveTransitionAnim; ParticleContext m_particleContext; Vector3D m_wallRunSurfacePos; diff --git a/src/game/server/ai_route.h b/src/game/server/ai_route.h index 01427f7b..fb0ad03e 100644 --- a/src/game/server/ai_route.h +++ b/src/game/server/ai_route.h @@ -22,7 +22,7 @@ public: char m_clusterPath[32]; char m_clusterPathNoExclusions[32]; float m_goalTolerance; - int m_activity; + sharedactivity_e m_activity; int m_sequence; int m_scriptMoveSequence; int m_target; @@ -31,9 +31,9 @@ public: char gap_71[3]; MovementTurn m_leftTurn; MovementTurn m_rightTurn; - int m_arrivalActivity; + sharedactivity_e m_arrivalActivity; int m_arrivalSequence; - int m_animArrivalAct; + sharedactivity_e m_animArrivalAct; int m_animArrivalSequence; float m_animArrivalDist; float m_animArrivalYaw;