Browse Source

Merge branch 'master' into dapiintegration

pull/7983/head
Anders Jenbo 12 months ago committed by GitHub
parent
commit
b757c551f9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      Source/monster.cpp

8
Source/monster.cpp

@ -3021,7 +3021,7 @@ bool IsRelativeMoveOK(const Monster &monster, Point position, Direction mdir)
return true; return true;
} }
bool IsMonsterAvalible(const MonsterData &monsterData) bool IsMonsterAvailable(const MonsterData &monsterData)
{ {
if (monsterData.availability == MonsterAvailability::Never) if (monsterData.availability == MonsterAvailability::Never)
return false; return false;
@ -3327,7 +3327,7 @@ tl::expected<void, std::string> GetLevelMTypes()
int skeletonTypeCount = 0; int skeletonTypeCount = 0;
_monster_id skeltypes[NUM_MTYPES]; _monster_id skeltypes[NUM_MTYPES];
for (_monster_id skeletonType : SkeletonTypes) { for (_monster_id skeletonType : SkeletonTypes) {
if (!IsMonsterAvalible(MonstersData[skeletonType])) if (!IsMonsterAvailable(MonstersData[skeletonType]))
continue; continue;
skeltypes[skeletonTypeCount++] = skeletonType; skeltypes[skeletonTypeCount++] = skeletonType;
@ -3338,8 +3338,8 @@ tl::expected<void, std::string> GetLevelMTypes()
_monster_id typelist[MaxMonsters]; _monster_id typelist[MaxMonsters];
int nt = 0; int nt = 0;
for (int i = MT_NZOMBIE; i < MonstersData.size(); i++) { for (size_t i = 0; i < MonstersData.size(); i++) {
if (!IsMonsterAvalible(MonstersData[i])) if (!IsMonsterAvailable(MonstersData[i]))
continue; continue;
typelist[nt++] = (_monster_id)i; typelist[nt++] = (_monster_id)i;

Loading…
Cancel
Save