Fix CBaseMonster::ReportAIState not handling all MONSTERSTATE enum va…

…lues Resolves #233
twhl-community · Jan 22, 2022 · eca7867 · eca7867
1 parent d7bef55
commit eca7867
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/game/server/entities/NPCs/monsters.cpp b/src/game/server/entities/NPCs/monsters.cpp
@@ -2895,7 +2895,9 @@ void CBaseMonster::ReportAIState()
 {
 	ALERT_TYPE level = at_console;
 
-	static const char* pStateNames[] = {"None", "Idle", "Combat", "Alert", "Hunt", "Prone", "Scripted", "Dead"};
+	static constexpr const char* pStateNames[] = {"None", "Idle", "Combat", "Alert", "Hunt", "Prone", "Scripted", "PlayDead", "Dead"};
+
+	static_assert(std::size(pStateNames) == MONSTERSTATE_COUNT, "You forgot to update the array of monster state names");
 
 	ALERT(level, "%s: ", STRING(pev->classname));
 	if ((std::size_t)m_MonsterState < std::size(pStateNames))

diff --git a/src/game/server/util.h b/src/game/server/util.h
@@ -178,7 +178,9 @@ typedef enum
 	MONSTERSTATE_PRONE,
 	MONSTERSTATE_SCRIPT,
 	MONSTERSTATE_PLAYDEAD,
-	MONSTERSTATE_DEAD
+	MONSTERSTATE_DEAD,
+
+	MONSTERSTATE_COUNT //Must be last, not a valid state
 
 } MONSTERSTATE;