Browse Source

Fix some compilation warnings

also removes a couple of unused filesystem includes
pull/5879/head
Gleb Mazovetskiy 3 years ago
parent
commit
c858ab4d2c
  1. 2
      Source/DiabloUI/settingsmenu.cpp
  2. 2
      Source/items.cpp
  3. 2
      Source/minitext.cpp
  4. 1
      Source/mpq/mpq_writer.cpp
  5. 3
      Source/options.cpp

2
Source/DiabloUI/settingsmenu.cpp

@ -176,6 +176,8 @@ void ItemFocused(int value)
auto *pOption = vecOptions[vecItem->m_value]; auto *pOption = vecOptions[vecItem->m_value];
UpdateDescription(*pOption); UpdateDescription(*pOption);
} break; } break;
default:
break;
} }
} }

2
Source/items.cpp

@ -4597,7 +4597,7 @@ void RechargeItem(Item &item, Player &player)
NetSendCmdChItem(true, INVLOC_HAND_RIGHT); NetSendCmdChItem(true, INVLOC_HAND_RIGHT);
return; return;
} }
for (size_t i = 0; i < player._pNumInv; i++) { for (int i = 0; i < player._pNumInv; i++) {
if (&item == &player.InvList[i]) { if (&item == &player.InvList[i]) {
NetSyncInvItem(player, i); NetSyncInvItem(player, i);
break; break;

2
Source/minitext.cpp

@ -156,6 +156,8 @@ void InitQTextMsg(_speech_id m)
case PS_WARR56: case PS_WARR56:
sfxnr = classSounds[static_cast<size_t>(HeroSpeech::EfficioObitusUtInimicus)]; sfxnr = classSounds[static_cast<size_t>(HeroSpeech::EfficioObitusUtInimicus)];
break; break;
default:
break;
} }
if (Speeches[m].scrlltxt) { if (Speeches[m].scrlltxt) {
QuestLogIsOpen = false; QuestLogIsOpen = false;

1
Source/mpq/mpq_writer.cpp

@ -13,7 +13,6 @@
#include "utils/file_util.h" #include "utils/file_util.h"
#include "utils/language.h" #include "utils/language.h"
#include "utils/log.hpp" #include "utils/log.hpp"
#include "utils/stdcompat/filesystem.hpp"
#include "utils/str_cat.hpp" #include "utils/str_cat.hpp"
namespace devilution { namespace devilution {

3
Source/options.cpp

@ -30,7 +30,6 @@
#include "utils/log.hpp" #include "utils/log.hpp"
#include "utils/paths.h" #include "utils/paths.h"
#include "utils/stdcompat/algorithm.hpp" #include "utils/stdcompat/algorithm.hpp"
#include "utils/stdcompat/filesystem.hpp"
#include "utils/str_cat.hpp" #include "utils/str_cat.hpp"
#include "utils/str_split.hpp" #include "utils/str_split.hpp"
#include "utils/utf8.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 }) , 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 #endif
, limitFPS("FPS Limiter", OptionEntryFlags::None, N_("FPS Limiter"), N_("FPS is limited to avoid high CPU load. Limit considers refresh rate."), true) , 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) , 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) , 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) , showManaValues("Show mana values", OptionEntryFlags::None, N_("Show mana values"), N_("Displays current / max mana value on mana globe."), false)
{ {

Loading…
Cancel
Save