Skip to content

Commit

Permalink
Renamed MONSTER_SUPERTYPE_8
Browse files Browse the repository at this point in the history
  • Loading branch information
captainurist committed Oct 10, 2023
1 parent 860b9ba commit 72ceaf8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Engine/Objects/MonsterEnums.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/GUI/UI/NPCTopics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ void prepareArenaFight(DIALOGUE_TYPE dialogue) {
std::vector<MonsterId> 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);
Expand Down

0 comments on commit 72ceaf8

Please sign in to comment.