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

🚨 Fix compiler warnings

Browse source
This commit is contained in:
Anders Jenbo 2021-09-09 04:16:24 +02:00
commit cd79f0204d
4 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/debug.cpp
View file

@ -68,7 +68,7 @@ void PrintDebugMonster(int m)
NetSendCmdString(1 << MyPlayerId, dstr);
sprintf(dstr, "Enemy = %i, HP = %i", monster._menemy, monster._mhitpoints);
NetSendCmdString(1 << MyPlayerId, dstr);
sprintf(dstr, "Mode = %i, Var1 = %i", monster._mmode, monster._mVar1);
sprintf(dstr, "Mode = %i, Var1 = %i", static_cast<int>(monster._mmode), monster._mVar1);
NetSendCmdString(1 << MyPlayerId, dstr);
bool bActive = false;
@ -195,7 +195,6 @@ std::string DebugCmdLoadMap(const string_view parameter)
return ret;
}
auto &myPlayer = Players[MyPlayerId];
auto level = atoi(parameter.data());
if (level < 1)
return fmt::format("Map id must be 1 or higher", level);
@ -479,11 +478,6 @@ std::string DebugCmdLevelSeed(const string_view parameter)
return fmt::format("Seedinfo for level {}\nseed: {}\nMid1: {}\nMid2: {}\nMid3: {}\nEnd: {}", currlevel, glSeedTbl[currlevel], glMid1Seed[currlevel], glMid2Seed[currlevel], glMid3Seed[currlevel], glEndSeed[currlevel]);
}
bool is_number(const std::string &s)
{
return !s.empty() && std::find_if(s.begin(), s.end(), [](unsigned char c) { return !std::isdigit(c); }) == s.end();
}
std::string DebugCmdSpawnMonster(const string_view parameter)
{
if (currlevel == 0)

4
Source/monster.cpp
View file

@ -1372,6 +1372,8 @@ bool MonsterWalk(int i, MonsterMode variant)
dFlags[monster.position.temp.x][monster.position.temp.y] &= ~BFLAG_MONSTLR;
dMonster[monster.position.tile.x][monster.position.tile.y] = i + 1;
break;
default:
break;
}
if (monster.mlid != NO_LIGHT)
ChangeLightXY(monster.mlid, monster.position.tile);
@ -3489,7 +3491,7 @@ const char *GetMonsterTypeText(const MonsterData &monsterData)
return _("Undead");
}
app_fatal("Unknown mMonstClass %i", monsterData.mMonstClass);
app_fatal("Unknown mMonstClass %i", static_cast<int>(monsterData.mMonstClass));
}
void ActivateSpawn(int i, Point position, Direction dir)

2
Source/player.cpp
View file

@ -3131,7 +3131,7 @@ void ApplyPlrDamage(int pnum, int dam, int minHP /*= 0*/, int frac /*= 0*/, int
int totalDamage = (dam << 6) + frac;
if (totalDamage > 0 && player.pManaShield) {
int manaShieldLevel = player._pSplLvl[SPL_MANASHIELD];
int8_t manaShieldLevel = player._pSplLvl[SPL_MANASHIELD];
if (manaShieldLevel > 0) {
totalDamage += totalDamage / -3;
}

3
Source/qol/monhealthbar.cpp
View file

@ -95,7 +95,7 @@ void DrawMonsterHealthBar(const Surface &out)
return 150;
default:
app_fatal("Invalid monster class '%i'.", monsterClass);
app_fatal("Invalid monster class '%i'.", static_cast<int>(monsterClass));
}
};
@ -109,7 +109,6 @@ void DrawMonsterHealthBar(const Surface &out)
UnsafeDrawVerticalLine(out, { position.x + width - border - 1, position.y + border + 1 }, borderHeight, borderColor);
}
int barLabelY = position.y;
UiFlags style = UiFlags::AlignCenter | UiFlags::VerticalCenter;
DrawString(out, monster.mName, { position + Displacement { -1, 1 }, width, height }, style | UiFlags::ColorBlack);
if (monster._uniqtype != 0)