From 72ceaf8b0a68ba7780d2c2fce262438ddb50dacc Mon Sep 17 00:00:00 2001 From: captainurist <73941350+captainurist@users.noreply.github.com> Date: Tue, 10 Oct 2023 10:14:19 +0700 Subject: [PATCH] Renamed MONSTER_SUPERTYPE_8 --- src/Engine/Objects/MonsterEnums.h | 2 +- src/GUI/UI/NPCTopics.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Engine/Objects/MonsterEnums.h b/src/Engine/Objects/MonsterEnums.h index cb752ceab7eb..4718275521aa 100644 --- a/src/Engine/Objects/MonsterEnums.h +++ b/src/Engine/Objects/MonsterEnums.h @@ -490,7 +490,7 @@ enum class MONSTER_SUPERTYPE { MONSTER_SUPERTYPE_WATER_ELEMENTAL = 0x5, MONSTER_SUPERTYPE_TREANT = 0x6, MONSTER_SUPERTYPE_TITAN = 0x7, - MONSTER_SUPERTYPE_8 = 0x8, // TODO(captainurist): not an arena monster? Drop? + MONSTER_SUPERTYPE_NOT_ARENA = 0x8, // Can't be spawned in Arena, no MM7 monster belongs to this supertype. }; using enum MONSTER_SUPERTYPE; diff --git a/src/GUI/UI/NPCTopics.cpp b/src/GUI/UI/NPCTopics.cpp index 3f03dcb28392..22243a642e95 100644 --- a/src/GUI/UI/NPCTopics.cpp +++ b/src/GUI/UI/NPCTopics.cpp @@ -326,7 +326,7 @@ void prepareArenaFight(DIALOGUE_TYPE dialogue) { std::vector candidateIds; for (MonsterId i : allArenaMonsters()) { if (pMonsterStats->pInfos[i].uAIType != MONSTER_AI_WIMP) { - if (supertypeForMonsterId(pMonsterStats->pInfos[i].uID) != MONSTER_SUPERTYPE_8) { + if (supertypeForMonsterId(pMonsterStats->pInfos[i].uID) != MONSTER_SUPERTYPE_NOT_ARENA) { if (pMonsterStats->pInfos[i].uLevel >= monsterMinLevel && pMonsterStats->pInfos[i].uLevel <= monsterMaxLevel) { candidateIds.push_back(i);