From 405d9d18b6e2331a646278d31cc2f5fa3f2a8f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Pir=C3=B3g?= <69601940+aetn23@users.noreply.github.com> Date: Fri, 1 Jul 2022 02:07:12 +0200 Subject: [PATCH] Monster cleanup (#4832) --- Source/monster.cpp | 12 ++++++------ Source/monster.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/monster.cpp b/Source/monster.cpp index fd4356744..e2f79b975 100644 --- a/Source/monster.cpp +++ b/Source/monster.cpp @@ -55,11 +55,11 @@ bool sgbSaveSoundOn; namespace { -constexpr const int NightmareToHitBonus = 85; -constexpr const int HellToHitBonus = 120; +constexpr int NightmareToHitBonus = 85; +constexpr int HellToHitBonus = 120; -constexpr const int NightmareAcBonus = 50; -constexpr const int HellAcBonus = 80; +constexpr int NightmareAcBonus = 50; +constexpr int HellAcBonus = 80; /** Tracks which missile files are already loaded */ int totalmonsters; @@ -119,7 +119,7 @@ constexpr const std::array<_monster_id, 12> SkeletonTypes { // }; /** Maps from monster walk animation frame num to monster velocity. */ -constexpr const int MWVel[24][3] = { +constexpr int MWVel[24][3] = { { 256, 512, 1024 }, { 128, 256, 512 }, { 85, 170, 341 }, @@ -146,7 +146,7 @@ constexpr const int MWVel[24][3] = { { 10, 21, 42 } }; /** Maps from monster action to monster animation letter. */ -constexpr const char Animletter[7] = "nwahds"; +constexpr char Animletter[7] = "nwahds"; size_t GetNumAnims(const MonsterData &monsterData) { diff --git a/Source/monster.h b/Source/monster.h index 84c4f1e15..f8ada89ab 100644 --- a/Source/monster.h +++ b/Source/monster.h @@ -25,8 +25,8 @@ namespace devilution { struct Missile; -constexpr const int MaxMonsters = 200; -constexpr const int MaxLvlMTypes = 24; +constexpr int MaxMonsters = 200; +constexpr int MaxLvlMTypes = 24; enum monster_flag : uint16_t { // clang-format off