MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

♻️ Convert 'MonsterClass' enum to enum class

Browse source
This commit is contained in:
Juliano Leal Goncalves 2021-09-01 23:34:19 -03:00 • committed by Anders Jenbo
commit 21b481bb46
6 changed files with 153 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/monster.cpp
View file

@ -1465,9 +1465,9 @@ void MonsterAttackPlayer(int i, int pnum, int hit, int minDam, int maxDam)
hper = 1000;
#endif
int ac = player.GetArmor();
if ((player.pDamAcFlags & ISPLHF_ACDEMON) != 0 && monster.MData->mMonstClass == MC_DEMON)
if ((player.pDamAcFlags & ISPLHF_ACDEMON) != 0 && monster.MData->mMonstClass == MonsterClass::MC_DEMON)
ac += 40;
if ((player.pDamAcFlags & ISPLHF_ACUNDEAD) != 0 && monster.MData->mMonstClass == MC_UNDEAD)
if ((player.pDamAcFlags & ISPLHF_ACUNDEAD) != 0 && monster.MData->mMonstClass == MonsterClass::MC_UNDEAD)
ac += 20;
hit += 2 * (monster.mLevel - player._pLevel)
+ 30
@ -3481,11 +3481,11 @@ void BoneDemonAi(int i)
const char *GetMonsterTypeText(const MonsterData &monsterData)
{
switch (monsterData.mMonstClass) {
case MC_ANIMAL:
case MonsterClass::MC_ANIMAL:
return _("Animal");
case MC_DEMON:
case MonsterClass::MC_DEMON:
return _("Demon");
case MC_UNDEAD:
case MonsterClass::MC_UNDEAD:
return _("Undead");
}