From 055988da778bc3a69dc49779b6c77eb181fa946b Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Wed, 31 May 2023 11:47:19 -0700 Subject: [PATCH] fix typo in NSMonster. --- src/shared/NSMonster.h | 88 ++++++++++++++++++++--------------------- src/shared/NSMonster.qc | 6 +-- 2 files changed, 45 insertions(+), 49 deletions(-) diff --git a/src/shared/NSMonster.h b/src/shared/NSMonster.h index c6b08f52..6672598c 100644 --- a/src/shared/NSMonster.h +++ b/src/shared/NSMonster.h @@ -232,52 +232,6 @@ Check their individual descriptions as to how you're supposed to approach them. */ class NSMonster:NSNavAI { -private: -#ifdef SERVER - entity m_ssLast; - vector oldnet_velocity; - float m_flPitch; - int m_iFlags; - vector base_mins; - vector base_maxs; - float base_health; - - /* sequences */ - string m_strRouteEnded; - int m_iSequenceRemove; - int m_iSequenceState; - float m_flSequenceEnd; - float m_flSequenceSpeed; - vector m_vecSequenceAngle; - int m_iSequenceFlags; - movementState_t m_iMoveState; - - int m_iTriggerCondition; - string m_strTriggerTarget; - - /* model events */ - float m_flBaseTime; - - /* attack/alliance system */ - entity m_eEnemy; - float m_flAttackThink; - monsterState_t m_iMState; - monsterState_t m_iOldMState; - vector m_vecLKPos; /* last-known pos */ - - /* see/hear subsystem */ - float m_flSeeTime; - /* animation cycles */ - float m_flAnimTime; - - /* timer for keeping track of the target */ - float m_flTrackingTime; - - PREDICTED_VECTOR_N(view_ofs) - - nonvirtual void _LerpTurnToEnemy(void); -#endif - public: void NSMonster(void); @@ -420,6 +374,48 @@ private: #endif #ifdef SERVER + entity m_ssLast; + vector oldnet_velocity; + float m_flPitch; + int m_iFlags; + vector base_mins; + vector base_maxs; + float base_health; + + /* sequences */ + string m_strRouteEnded; + int m_iSequenceRemove; + int m_iSequenceState; + float m_flSequenceEnd; + float m_flSequenceSpeed; + vector m_vecSequenceAngle; + int m_iSequenceFlags; + movementState_t m_iMoveState; + + int m_iTriggerCondition; + string m_strTriggerTarget; + + /* model events */ + float m_flBaseTime; + + /* attack/alliance system */ + entity m_eEnemy; + float m_flAttackThink; + monsterState_t m_iMState; + monsterState_t m_iOldMState; + vector m_vecLKPos; /* last-known pos */ + + /* see/hear subsystem */ + float m_flSeeTime; + /* animation cycles */ + float m_flAnimTime; + + /* timer for keeping track of the target */ + float m_flTrackingTime; + + PREDICTED_VECTOR_N(view_ofs) + + nonvirtual void _LerpTurnToEnemy(void); virtual void _Alerted(void); #endif }; diff --git a/src/shared/NSMonster.qc b/src/shared/NSMonster.qc index c7f2d063..5d22fda1 100644 --- a/src/shared/NSMonster.qc +++ b/src/shared/NSMonster.qc @@ -424,21 +424,21 @@ var float autocvar_ai_stepSize = 128; float NSMonster::GetWalkSpeed(void) { - float speed = autocvar_ai_stepsize / frameduration(modelindex, AnimWalk()); + float speed = autocvar_ai_stepSize / frameduration(modelindex, AnimWalk()); return speed; } float NSMonster::GetChaseSpeed(void) { - float speed = autocvar_ai_stepsize / frameduration(modelindex, AnimRun()); + float speed = autocvar_ai_stepSize / frameduration(modelindex, AnimRun()); return speed; } float NSMonster::GetRunSpeed(void) { - float speed = autocvar_ai_stepsize / frameduration(modelindex, AnimRun()); + float speed = autocvar_ai_stepSize / frameduration(modelindex, AnimRun()); return speed; }