mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 05:10:26 +00:00
Code Issues Releases Wiki Activity

Use settings values for HUD settings

Browse source
This commit is contained in:
elsid 2023-07-19 22:53:35 +02:00
parent 23f95cf762
commit fac1927f5e
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwgui/windowmanagerimp.cpp
View file

@ -183,7 +183,6 @@ namespace MWGui
, mContainerWindow(nullptr) , mContainerWindow(nullptr)
, mTranslationDataStorage(translationDataStorage) , mTranslationDataStorage(translationDataStorage)
, mInputBlocker(nullptr) , mInputBlocker(nullptr)
, mCrosshairEnabled(Settings::Manager::getBool("crosshair", "HUD"))
, mHudEnabled(true) , mHudEnabled(true)
, mCursorVisible(true) , mCursorVisible(true)
, mCursorActive(true) , mCursorActive(true)
@ -1148,9 +1147,7 @@ namespace MWGui
bool changeRes = false; bool changeRes = false;
for (const auto& setting : changed) for (const auto& setting : changed)
{ {
if (setting.first == "HUD" && setting.second == "crosshair") if (setting.first == "GUI" && setting.second == "menu transparency")
mCrosshairEnabled = Settings::Manager::getBool("crosshair", "HUD");
else if (setting.first == "GUI" && setting.second == "menu transparency")
setMenuTransparency(Settings::gui().mMenuTransparency); setMenuTransparency(Settings::gui().mMenuTransparency);
else if (setting.first == "Video" else if (setting.first == "Video"
&& (setting.second == "resolution x" || setting.second == "resolution y" && (setting.second == "resolution x" || setting.second == "resolution y"
@ -1580,7 +1577,7 @@ namespace MWGui
void WindowManager::showCrosshair(bool show) void WindowManager::showCrosshair(bool show)
{ {
if (mHud) if (mHud)
mHud->setCrosshairVisible(show && mCrosshairEnabled); mHud->setCrosshairVisible(show && Settings::hud().mCrosshair);
} }
void WindowManager::updateActivatedQuickKey() void WindowManager::updateActivatedQuickKey()

1
apps/openmw/mwgui/windowmanagerimp.hpp
View file

@ -457,7 +457,6 @@ namespace MWGui
MyGUI::Widget* mInputBlocker; MyGUI::Widget* mInputBlocker;
bool mCrosshairEnabled;
bool mHudEnabled; bool mHudEnabled;
bool mCursorVisible; bool mCursorVisible;
bool mCursorActive; bool mCursorActive;