From 1fb58e4ff2a38823d46f8f78d16d190a72a56c66 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 9 May 2025 05:00:42 +0200 Subject: [PATCH 1/2] Load the correct number of monsters --- Source/monster.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/monster.cpp b/Source/monster.cpp index f003d66d7..e3e9e6488 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -3338,7 +3338,7 @@ tl::expected GetLevelMTypes() _monster_id typelist[MaxMonsters]; int nt = 0; - for (int i = MT_NZOMBIE; i < NUM_MTYPES; i++) { + for (size_t i = 0; i < MonstersData.size(); i++) { if (!IsMonsterAvalible(MonstersData[i])) continue; From f622ec1428748d6f4a91176b1c4327f81d929a87 Mon Sep 17 00:00:00 2001 From: staphen Date: Fri, 9 May 2025 09:22:14 -0400 Subject: [PATCH 2/2] Fix typo: IsMonsterAvalible -> IsMonsterAvailable --- Source/monster.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/monster.cpp b/Source/monster.cpp index e3e9e6488..a4c050341 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -3021,7 +3021,7 @@ bool IsRelativeMoveOK(const Monster &monster, Point position, Direction mdir) return true; } -bool IsMonsterAvalible(const MonsterData &monsterData) +bool IsMonsterAvailable(const MonsterData &monsterData) { if (monsterData.availability == MonsterAvailability::Never) return false; @@ -3327,7 +3327,7 @@ tl::expected GetLevelMTypes() int skeletonTypeCount = 0; _monster_id skeltypes[NUM_MTYPES]; for (_monster_id skeletonType : SkeletonTypes) { - if (!IsMonsterAvalible(MonstersData[skeletonType])) + if (!IsMonsterAvailable(MonstersData[skeletonType])) continue; skeltypes[skeletonTypeCount++] = skeletonType; @@ -3339,7 +3339,7 @@ tl::expected GetLevelMTypes() int nt = 0; for (size_t i = 0; i < MonstersData.size(); i++) { - if (!IsMonsterAvalible(MonstersData[i])) + if (!IsMonsterAvailable(MonstersData[i])) continue; typelist[nt++] = (_monster_id)i;