From c858ab4d2c7f4d55dd1df1a229eee95d6b139eee Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 12 Mar 2023 11:15:28 +0000 Subject: [PATCH] Fix some compilation warnings also removes a couple of unused filesystem includes --- Source/DiabloUI/settingsmenu.cpp | 2 ++ Source/items.cpp | 2 +- Source/minitext.cpp | 2 ++ Source/mpq/mpq_writer.cpp | 1 - Source/options.cpp | 3 +-- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Source/DiabloUI/settingsmenu.cpp b/Source/DiabloUI/settingsmenu.cpp index 43743ad76..f42b8d54d 100644 --- a/Source/DiabloUI/settingsmenu.cpp +++ b/Source/DiabloUI/settingsmenu.cpp @@ -176,6 +176,8 @@ void ItemFocused(int value) auto *pOption = vecOptions[vecItem->m_value]; UpdateDescription(*pOption); } break; + default: + break; } } diff --git a/Source/items.cpp b/Source/items.cpp index d00159246..c32224166 100644 --- a/Source/items.cpp +++ b/Source/items.cpp @@ -4597,7 +4597,7 @@ void RechargeItem(Item &item, Player &player) NetSendCmdChItem(true, INVLOC_HAND_RIGHT); return; } - for (size_t i = 0; i < player._pNumInv; i++) { + for (int i = 0; i < player._pNumInv; i++) { if (&item == &player.InvList[i]) { NetSyncInvItem(player, i); break; diff --git a/Source/minitext.cpp b/Source/minitext.cpp index be4a52474..68a5ac880 100644 --- a/Source/minitext.cpp +++ b/Source/minitext.cpp @@ -156,6 +156,8 @@ void InitQTextMsg(_speech_id m) case PS_WARR56: sfxnr = classSounds[static_cast(HeroSpeech::EfficioObitusUtInimicus)]; break; + default: + break; } if (Speeches[m].scrlltxt) { QuestLogIsOpen = false; diff --git a/Source/mpq/mpq_writer.cpp b/Source/mpq/mpq_writer.cpp index 56dc39e8f..1d3ab8b50 100644 --- a/Source/mpq/mpq_writer.cpp +++ b/Source/mpq/mpq_writer.cpp @@ -13,7 +13,6 @@ #include "utils/file_util.h" #include "utils/language.h" #include "utils/log.hpp" -#include "utils/stdcompat/filesystem.hpp" #include "utils/str_cat.hpp" namespace devilution { diff --git a/Source/options.cpp b/Source/options.cpp index 0ece5640e..b65acbe71 100644 --- a/Source/options.cpp +++ b/Source/options.cpp @@ -30,7 +30,6 @@ #include "utils/log.hpp" #include "utils/paths.h" #include "utils/stdcompat/algorithm.hpp" -#include "utils/stdcompat/filesystem.hpp" #include "utils/str_cat.hpp" #include "utils/str_split.hpp" #include "utils/utf8.hpp" @@ -993,8 +992,8 @@ GraphicsOptions::GraphicsOptions() , hardwareCursorMaxSize("Hardware Cursor Maximum Size", OptionEntryFlags::CantChangeInGame | OptionEntryFlags::RecreateUI | (HardwareCursorSupported() ? OptionEntryFlags::None : OptionEntryFlags::Invisible), N_("Hardware Cursor Maximum Size"), N_("Maximum width / height for the hardware cursor. Larger cursors fall back to software."), 128, { 0, 64, 128, 256, 512 }) #endif , limitFPS("FPS Limiter", OptionEntryFlags::None, N_("FPS Limiter"), N_("FPS is limited to avoid high CPU load. Limit considers refresh rate."), true) - , showFPS("Show FPS", OptionEntryFlags::None, N_("Show FPS"), N_("Displays the FPS in the upper left corner of the screen."), false) , showItemGraphicsInStores("Show Item Graphics in Stores", OptionEntryFlags::None, N_("Show Item Graphics in Stores"), N_("Show item graphics to the left of item descriptions in store menus."), false) + , showFPS("Show FPS", OptionEntryFlags::None, N_("Show FPS"), N_("Displays the FPS in the upper left corner of the screen."), false) , showHealthValues("Show health values", OptionEntryFlags::None, N_("Show health values"), N_("Displays current / max health value on health globe."), false) , showManaValues("Show mana values", OptionEntryFlags::None, N_("Show mana values"), N_("Displays current / max mana value on mana globe."), false) {