diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp index c7189bc340..dc823e2f15 100644 --- a/apps/openmw/mwgui/class.cpp +++ b/apps/openmw/mwgui/class.cpp @@ -1021,8 +1021,8 @@ namespace MWGui SelectSkillDialog::SelectSkillDialog() : WindowModal("openmw_chargen_select_skill.layout") - , mSkillId(ESM::Skill::Block) , mControllerFocus(0) + , mSkillId(ESM::Skill::Block) , mNumSkillsPerSpecialization{} { // Centre dialog diff --git a/apps/openmw/mwgui/class.h b/apps/openmw/mwgui/class.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp index 5a769e15bd..6db9a9dc34 100644 --- a/apps/openmw/mwgui/class.hpp +++ b/apps/openmw/mwgui/class.hpp @@ -51,7 +51,7 @@ namespace MWGui MyGUI::TextBox* mText; MyGUI::Widget* mButtonBar; std::vector mButtons; - size_t mControllerFocus; + size_t mControllerFocus = 0; }; // Lets the player choose between 3 ways of creating a class @@ -218,7 +218,7 @@ namespace MWGui void onAttributeClicked(Widgets::MWAttributePtr _sender); void onCancelClicked(MyGUI::Widget* _sender); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - size_t mControllerFocus; + size_t mControllerFocus = 0; std::vector mAttributeButtons; private: @@ -252,7 +252,7 @@ namespace MWGui void onSkillClicked(Widgets::MWSkillPtr _sender); void onCancelClicked(MyGUI::Widget* _sender); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - size_t mControllerFocus; + size_t mControllerFocus = 0; std::vector mSkillButtons; private: @@ -353,7 +353,7 @@ namespace MWGui Widgets::MWSkillPtr mAffectedSkill; bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - size_t mControllerFocus; + size_t mControllerFocus = 0; }; } #endif diff --git a/apps/openmw/mwgui/itemchargeview.hpp b/apps/openmw/mwgui/itemchargeview.hpp index 73bf9c3de2..fd0388d83a 100644 --- a/apps/openmw/mwgui/itemchargeview.hpp +++ b/apps/openmw/mwgui/itemchargeview.hpp @@ -75,7 +75,7 @@ namespace MWGui MyGUI::ScrollView* mScrollView; DisplayMode mDisplayMode; - int mControllerFocus; + int mControllerFocus = 0; void updateControllerFocus(int prevFocus, int newFocus); }; } diff --git a/apps/openmw/mwgui/levelupdialog.hpp b/apps/openmw/mwgui/levelupdialog.hpp index 70bd2839f2..5176d1866b 100644 --- a/apps/openmw/mwgui/levelupdialog.hpp +++ b/apps/openmw/mwgui/levelupdialog.hpp @@ -53,7 +53,7 @@ namespace MWGui bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; std::vector mAttributeButtons; - size_t mControllerFocus; + size_t mControllerFocus = 0; }; } diff --git a/apps/openmw/mwgui/mapwindow.hpp b/apps/openmw/mwgui/mapwindow.hpp index 9a474e8170..379141fb61 100644 --- a/apps/openmw/mwgui/mapwindow.hpp +++ b/apps/openmw/mwgui/mapwindow.hpp @@ -225,7 +225,7 @@ namespace MWGui MyGUI::Button* mDeleteButton; bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - int mControllerFocus; + int mControllerFocus = 0; }; class MapWindow : public MWGui::WindowPinnableBase, public LocalMapBase, public NoDrop diff --git a/apps/openmw/mwgui/merchantrepair.hpp b/apps/openmw/mwgui/merchantrepair.hpp index 28fb2a7c3c..119258f7ad 100644 --- a/apps/openmw/mwgui/merchantrepair.hpp +++ b/apps/openmw/mwgui/merchantrepair.hpp @@ -27,7 +27,7 @@ namespace MWGui MWWorld::Ptr mActor; - size_t mControllerFocus; + size_t mControllerFocus = 0; protected: void onMouseWheel(MyGUI::Widget* _sender, int _rel); diff --git a/apps/openmw/mwgui/messagebox.hpp b/apps/openmw/mwgui/messagebox.hpp index 98eb69cc69..d48223d1a4 100644 --- a/apps/openmw/mwgui/messagebox.hpp +++ b/apps/openmw/mwgui/messagebox.hpp @@ -116,7 +116,7 @@ namespace MWGui int mButtonPressed; size_t mDefaultFocus; bool mImmediate; - size_t mControllerFocus; + size_t mControllerFocus = 0; }; } diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp index 782949b99a..a7c408f1f9 100644 --- a/apps/openmw/mwgui/quickkeysmenu.cpp +++ b/apps/openmw/mwgui/quickkeysmenu.cpp @@ -40,7 +40,6 @@ namespace MWGui , mKey(std::vector(10)) , mSelected(nullptr) , mActivated(nullptr) - , mControllerFocus(0) { getWidget(mOkButton, "OKButton"); getWidget(mInstructionLabel, "InstructionLabel"); @@ -506,7 +505,6 @@ namespace MWGui QuickKeysMenuAssign::QuickKeysMenuAssign(QuickKeysMenu* parent) : WindowModal("openmw_quickkeys_menu_assign.layout") , mParent(parent) - , mControllerFocus(0) { getWidget(mLabel, "Label"); getWidget(mItemButton, "ItemButton"); diff --git a/apps/openmw/mwgui/quickkeysmenu.hpp b/apps/openmw/mwgui/quickkeysmenu.hpp index 11648cdb40..30cd893c84 100644 --- a/apps/openmw/mwgui/quickkeysmenu.hpp +++ b/apps/openmw/mwgui/quickkeysmenu.hpp @@ -75,7 +75,7 @@ namespace MWGui void assignItem(MWWorld::Ptr item); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - size_t mControllerFocus; + size_t mControllerFocus = 0; }; class QuickKeysMenuAssign : public WindowModal @@ -93,7 +93,7 @@ namespace MWGui QuickKeysMenu* mParent; bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - int mControllerFocus; + int mControllerFocus = 0; }; class MagicSelectionDialog : public WindowModal @@ -114,7 +114,7 @@ namespace MWGui void onModelIndexSelected(SpellModel::ModelIndex index); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - int mControllerFocus; + int mControllerFocus = 0; }; } diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp index cd3fc594a7..78d88887db 100644 --- a/apps/openmw/mwgui/review.hpp +++ b/apps/openmw/mwgui/review.hpp @@ -104,7 +104,7 @@ namespace MWGui // 0 = Name, 1 = Race, 2 = Class, 3 = BirthSign, 4 = Back, 5 = OK std::vector mButtons; - int mControllerFocus; + int mControllerFocus = 0; }; } #endif diff --git a/apps/openmw/mwgui/spellbuyingwindow.hpp b/apps/openmw/mwgui/spellbuyingwindow.hpp index a53b57cc09..ad47749228 100644 --- a/apps/openmw/mwgui/spellbuyingwindow.hpp +++ b/apps/openmw/mwgui/spellbuyingwindow.hpp @@ -58,7 +58,7 @@ namespace MWGui private: static bool sortSpells(const ESM::Spell* left, const ESM::Spell* right); bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - size_t mControllerFocus; + size_t mControllerFocus = 0; }; } diff --git a/apps/openmw/mwgui/spellcreationdialog.hpp b/apps/openmw/mwgui/spellcreationdialog.hpp index f2c440d305..8d96a9727d 100644 --- a/apps/openmw/mwgui/spellcreationdialog.hpp +++ b/apps/openmw/mwgui/spellcreationdialog.hpp @@ -94,7 +94,7 @@ namespace MWGui bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; void updateControllerFocus(int prevFocus, int newFocus); - int mControllerFocus; + int mControllerFocus = 0; std::vector mButtons; }; diff --git a/apps/openmw/mwgui/trainingwindow.hpp b/apps/openmw/mwgui/trainingwindow.hpp index f44c5524f5..c6c9cdf5c8 100644 --- a/apps/openmw/mwgui/trainingwindow.hpp +++ b/apps/openmw/mwgui/trainingwindow.hpp @@ -55,7 +55,7 @@ namespace MWGui TimeAdvancer mTimeAdvancer; bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - size_t mControllerFocus; + size_t mControllerFocus = 0; }; } diff --git a/apps/openmw/mwgui/travelwindow.hpp b/apps/openmw/mwgui/travelwindow.hpp index c0002b805b..4b155e4535 100644 --- a/apps/openmw/mwgui/travelwindow.hpp +++ b/apps/openmw/mwgui/travelwindow.hpp @@ -42,7 +42,7 @@ namespace MWGui private: bool onControllerButtonEvent(const SDL_ControllerButtonEvent& arg) override; - size_t mControllerFocus; + size_t mControllerFocus = 0; }; }