From 08410b9062b54ece3b8bb96c902291de1aa81e40 Mon Sep 17 00:00:00 2001 From: Adam Hogan Date: Sun, 9 Sep 2012 14:10:07 -0400 Subject: [PATCH] Renamed SpellBuyingWindow, took some suggestions from scrawl --- apps/openmw/CMakeLists.txt | 2 +- apps/openmw/mwbase/windowmanager.hpp | 4 +- apps/openmw/mwgui/dialogue.cpp | 6 +- apps/openmw/mwgui/mode.hpp | 2 +- ...spellswindow.cpp => spellbuyingwindow.cpp} | 148 +++++------------- ...spellswindow.hpp => spellbuyingwindow.hpp} | 28 ++-- apps/openmw/mwgui/windowmanagerimp.cpp | 18 +-- apps/openmw/mwgui/windowmanagerimp.hpp | 6 +- files/mygui/CMakeLists.txt | 2 +- ...yout => openmw_spell_buying_window.layout} | 0 files/mygui/openmw_text.skin.xml | 8 + 11 files changed, 75 insertions(+), 149 deletions(-) rename apps/openmw/mwgui/{spellswindow.cpp => spellbuyingwindow.cpp} (56%) rename apps/openmw/mwgui/{spellswindow.hpp => spellbuyingwindow.hpp} (57%) rename files/mygui/{openmw_spells_window.layout => openmw_spell_buying_window.layout} (100%) diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index aa66ba791..4cf3bd7fd 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -29,7 +29,7 @@ add_openmw_dir (mwgui map_window window_pinnable_base cursorreplace tooltips scrollwindow bookwindow list formatting inventorywindow container hud countdialog tradewindow settingswindow confirmationdialog alchemywindow referenceinterface spellwindow mainmenu quickkeysmenu - itemselection spellswindow + itemselection spellbuyingwindow ) add_openmw_dir (mwdialogue diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp index 99f1e46d2..14b1051e8 100644 --- a/apps/openmw/mwbase/windowmanager.hpp +++ b/apps/openmw/mwbase/windowmanager.hpp @@ -42,7 +42,7 @@ namespace MWGui class Console; class SpellWindow; class TradeWindow; - class SpellsWindow; + class SpellBuyingWindow; class ConfirmationDialog; class CountDialog; class ScrollWindow; @@ -107,7 +107,7 @@ namespace MWBase virtual MWGui::CountDialog* getCountDialog() = 0; virtual MWGui::ConfirmationDialog* getConfirmationDialog() = 0; virtual MWGui::TradeWindow* getTradeWindow() = 0; - virtual MWGui::SpellsWindow* getSpellsWindow() = 0; + virtual MWGui::SpellBuyingWindow* getSpellBuyingWindow() = 0; virtual MWGui::SpellWindow* getSpellWindow() = 0; virtual MWGui::Console* getConsole() = 0; diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 949e745f2..20ae1fd65 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -17,7 +17,7 @@ #include "widgets.hpp" #include "list.hpp" #include "tradewindow.hpp" -#include "spellswindow.hpp" +#include "spellbuyingwindow.hpp" #include "inventorywindow.hpp" using namespace MWGui; @@ -131,8 +131,8 @@ void DialogueWindow::onSelectTopic(std::string topic) } else if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sSpells")->str) { - mWindowManager.pushGuiMode(GM_Spells); - mWindowManager.getSpellsWindow()->startSpells(mPtr); + mWindowManager.pushGuiMode(GM_SpellBuying); + mWindowManager.getSpellBuyingWindow()->startSpellBuying(mPtr); } else diff --git a/apps/openmw/mwgui/mode.hpp b/apps/openmw/mwgui/mode.hpp index 8c0a2fc5f..4417f7b9c 100644 --- a/apps/openmw/mwgui/mode.hpp +++ b/apps/openmw/mwgui/mode.hpp @@ -20,7 +20,7 @@ namespace MWGui GM_Dialogue, // NPC interaction GM_Barter, GM_Rest, - GM_Spells, + GM_SpellBuying, // Startup character creation dialogs GM_Name, diff --git a/apps/openmw/mwgui/spellswindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp similarity index 56% rename from apps/openmw/mwgui/spellswindow.cpp rename to apps/openmw/mwgui/spellbuyingwindow.cpp index 5e1797823..af6bb182d 100644 --- a/apps/openmw/mwgui/spellswindow.cpp +++ b/apps/openmw/mwgui/spellbuyingwindow.cpp @@ -1,4 +1,4 @@ -#include "spellswindow.hpp" +#include "spellbuyingwindow.hpp" #include @@ -18,19 +18,16 @@ namespace MWGui { - const int SpellsWindow::sLineHeight = 18; + const int SpellBuyingWindow::sLineHeight = 18; - SpellsWindow::SpellsWindow(MWBase::WindowManager& parWindowManager) : + SpellBuyingWindow::SpellBuyingWindow(MWBase::WindowManager& parWindowManager) : WindowBase("openmw_spells_window.layout", parWindowManager) , ContainerBase(NULL) // no drag&drop , mSpellsWidgetMap() , mCurrentY(0) , mLastPos(0) - , mSpellsWidgets() - , mSpellsPriceMap() { setCoord(0, 0, 450, 300); - center(); getWidget(mCancelButton, "CancelButton"); getWidget(mPlayerGold, "PlayerGold"); @@ -40,11 +37,11 @@ namespace MWGui getWidget(mSpellsClientWidget, "SpellsClient"); getWidget(mSpellsScrollerWidget, "SpellsScroller"); - mSpellsClientWidget->eventMouseWheel += MyGUI::newDelegate(this, &SpellsWindow::onMouseWheel); + mSpellsClientWidget->eventMouseWheel += MyGUI::newDelegate(this, &SpellBuyingWindow::onMouseWheel); - mSpellsScrollerWidget->eventScrollChangePosition += MyGUI::newDelegate(this, &SpellsWindow::onScrollChangePosition); + mSpellsScrollerWidget->eventScrollChangePosition += MyGUI::newDelegate(this, &SpellBuyingWindow::onScrollChangePosition); - mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellsWindow::onCancelButtonClicked); + mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellBuyingWindow::onCancelButtonClicked); int cancelButtonWidth = mCancelButton->getTextSize().width + 24; mCancelButton->setCoord(430-cancelButtonWidth, @@ -59,71 +56,40 @@ namespace MWGui mSelect->getTop(), mSelect->getTextSize().width, mSelect->getHeight()); - - static_cast(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &SpellsWindow::onWindowResize); } - void SpellsWindow::addSpell(std::string spellID) + void SpellBuyingWindow::addSpell(std::string spellID) { MyGUI::Button* toAdd; - - toAdd = mSpellsClientWidget->createWidget("SandText", 0, mCurrentY, 200, sLineHeight, MyGUI::Align::Default); - mCurrentY += sLineHeight; const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().spells.find(spellID); - /// \todo price adjustment depending on merchantile skill int price = spell->data.cost*MWBase::Environment::get().getWorld()->getStore().gameSettings.search("fSpellValueMult")->f; - mSpellsPriceMap.insert(std::pair(spell,price)); - if (price>mWindowManager.getInventoryWindow()->getPlayerGold()) - toAdd->setCaption("#A3997B" + spell->name+" - "+boost::lexical_cast(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str); - else - toAdd->setCaption(spell->name+" - "+boost::lexical_cast(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str); + toAdd = mSpellsClientWidget->createWidget((price>mWindowManager.getInventoryWindow()->getPlayerGold()) ? "SandTextGreyedOut" : "SpellText", 0, mCurrentY, 200, sLineHeight, MyGUI::Align::Default); + mCurrentY += sLineHeight; + /// \todo price adjustment depending on merchantile skill + toAdd->setUserData(price); + toAdd->setCaption(spell->name+" - "+boost::lexical_cast(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str); toAdd->setSize(toAdd->getTextSize().width,sLineHeight); - toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellsWindow::onMouseWheel); + toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellBuyingWindow::onMouseWheel); toAdd->setUserString("ToolTipType", "Spell"); toAdd->setUserString("Spell", spellID); - toAdd->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellsWindow::onSpellButtonClick); - toAdd->eventMouseSetFocus += MyGUI::newDelegate(this, &SpellsWindow::onFocus); - toAdd->eventMouseLostFocus += MyGUI::newDelegate(this, &SpellsWindow::onFocusLost); - mSpellsWidgets.push_back(toAdd); + toAdd->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellBuyingWindow::onSpellButtonClick); mSpellsWidgetMap.insert(std::pair(toAdd,spell)); } - void SpellsWindow::onFocusLost(MyGUI::Widget* _sender, MyGUI::Widget* _old) - { - updateLabels(); - } - - void SpellsWindow::onFocus(MyGUI::Widget* _sender, MyGUI::Widget* _old) - { - updateLabels(); - MyGUI::Button* toUpdate; - toUpdate = (MyGUI::Button*) _sender; - const ESM::Spell* spell = mSpellsWidgetMap.find(toUpdate)->second; - int price = mSpellsPriceMap.find(spell)->second; - if (price>mWindowManager.getInventoryWindow()->getPlayerGold()) - toUpdate->setCaption("#A3997B" + spell->name+" - "+boost::lexical_cast(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str); - else - toUpdate->setCaption("#D8C09A" + spell->name+" - "+boost::lexical_cast(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str); - } - - void SpellsWindow::clearSpells() + void SpellBuyingWindow::clearSpells() { mSpellsScrollerWidget->setScrollPosition(0); onScrollChangePosition(mSpellsScrollerWidget, mSpellsScrollerWidget->getScrollPosition()); mCurrentY = 0; - mSpellsWidgets.clear(); - while (mSpellsClientWidget->getChildCount()!=0) - { - MyGUI::Widget* toRemove; - toRemove = mSpellsClientWidget->getChildAt(0); - mSpellsClientWidget->_destroyChildWidget(toRemove); - } + while (mSpellsClientWidget->getChildCount()) + MyGUI::Gui::getInstance().destroyWidget(mSpellsClientWidget->getChildAt(0)); mSpellsWidgetMap.clear(); - mSpellsPriceMap.clear(); } - void SpellsWindow::startSpells(MWWorld::Ptr actor) + void SpellBuyingWindow::startSpellBuying(MWWorld::Ptr actor) { + center(); + mActor = actor; clearSpells(); if (actor.getTypeName() == typeid(ESM::NPC).name()) @@ -150,10 +116,10 @@ namespace MWGui updateScroller(); } - void SpellsWindow::onSpellButtonClick(MyGUI::Widget* _sender) + void SpellBuyingWindow::onSpellButtonClick(MyGUI::Widget* _sender) { const ESM::Spell* spell = mSpellsWidgetMap.find(_sender)->second; - int price = mSpellsPriceMap.find(spell)->second; + int price = *_sender->getUserData(); if (mWindowManager.getInventoryWindow()->getPlayerGold()>=price) { @@ -162,48 +128,19 @@ namespace MWGui MWMechanics::Spells& spells = stats.getSpells(); spells.add(spell->name); mWindowManager.getTradeWindow()->addOrRemoveGold(-price); - mSpellsWidgetMap.erase(_sender); - mSpellsPriceMap.erase(spell); - for (std::vector::iterator it = mSpellsWidgets.begin(); it != mSpellsWidgets.end(); ++it) - { - if (*it==_sender) - { - mSpellsWidgets.erase(it); - break; - } - } - mSpellsClientWidget->_destroyChildWidget(_sender); - unsigned int i; mSpellsScrollerWidget->setScrollPosition(0); onScrollChangePosition(mSpellsScrollerWidget, mSpellsScrollerWidget->getScrollPosition()); - mCurrentY = 0; - for (i=0;igetChildCount();i++) - { - MyGUI::Widget* toMove; - toMove = mSpellsClientWidget->getChildAt(i); - toMove->setPosition(0,mCurrentY); - mCurrentY+=sLineHeight; - } + updateScroller(); + startSpellBuying(mActor); } - else - { - - } - updateLabels(); - updateScroller(); } - void SpellsWindow::onWindowResize(MyGUI::Window* _sender) + void SpellBuyingWindow::onCancelButtonClicked(MyGUI::Widget* _sender) { - + mWindowManager.removeGuiMode(GM_SpellBuying); } - void SpellsWindow::onCancelButtonClicked(MyGUI::Widget* _sender) - { - mWindowManager.removeGuiMode(GM_Spells); - } - - void SpellsWindow::updateLabels() + void SpellBuyingWindow::updateLabels() { mPlayerGold->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str + ": " + boost::lexical_cast(mWindowManager.getInventoryWindow()->getPlayerGold())); @@ -211,28 +148,16 @@ namespace MWGui mPlayerGold->getTop(), mPlayerGold->getTextSize().width, mPlayerGold->getHeight()); - unsigned int i; - for (i=0;igetChildCount();i++) - { - MyGUI::Button* toUpdate; - toUpdate = (MyGUI::Button*) mSpellsClientWidget->getChildAt(i); - const ESM::Spell* spell = mSpellsWidgetMap.find(toUpdate)->second; - int price = mSpellsPriceMap.find(spell)->second; - if (price>mWindowManager.getInventoryWindow()->getPlayerGold()) - toUpdate->setCaption("#A3997B" + spell->name+" - "+boost::lexical_cast(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str); - else - toUpdate->setCaption(spell->name+" - "+boost::lexical_cast(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str); - } } - void SpellsWindow::onReferenceUnavailable() + void SpellBuyingWindow::onReferenceUnavailable() { // remove both Spells and Dialogue (since you always trade with the NPC/creature that you have previously talked to) - mWindowManager.removeGuiMode(GM_Spells); + mWindowManager.removeGuiMode(GM_SpellBuying); mWindowManager.removeGuiMode(GM_Dialogue); } - void SpellsWindow::updateScroller() + void SpellBuyingWindow::updateScroller() { mSpellsScrollerWidget->setScrollRange(std::max(mCurrentY - mSpellsClientWidget->getHeight(), 0)); mSpellsScrollerWidget->setScrollPage(std::max(mSpellsClientWidget->getHeight() - sLineHeight, 0)); @@ -240,7 +165,7 @@ namespace MWGui mSpellsScrollerWidget->setTrackSize( (mSpellsBoxWidget->getHeight() / float(mCurrentY)) * mSpellsScrollerWidget->getLineSize() ); } - void SpellsWindow::onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos) + void SpellBuyingWindow::onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos) { int diff = mLastPos - pos; // Adjust position of all widget according to difference @@ -248,14 +173,16 @@ namespace MWGui return; mLastPos = pos; - std::vector::const_iterator end = mSpellsWidgets.end(); - for (std::vector::const_iterator it = mSpellsWidgets.begin(); it != end; ++it) + unsigned int i; + for (i=0;igetChildCount();i++) { - (*it)->setCoord((*it)->getCoord() + MyGUI::IntPoint(0, diff)); + MyGUI::Widget* toMove; + toMove = mSpellsClientWidget->getChildAt(i); + toMove->setCoord(toMove->getCoord() + MyGUI::IntPoint(0, diff)); } } - void SpellsWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel) + void SpellBuyingWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel) { if (mSpellsScrollerWidget->getScrollPosition() - _rel*0.3 < 0) mSpellsScrollerWidget->setScrollPosition(0); @@ -267,3 +194,4 @@ namespace MWGui onScrollChangePosition(mSpellsScrollerWidget, mSpellsScrollerWidget->getScrollPosition()); } } + diff --git a/apps/openmw/mwgui/spellswindow.hpp b/apps/openmw/mwgui/spellbuyingwindow.hpp similarity index 57% rename from apps/openmw/mwgui/spellswindow.hpp rename to apps/openmw/mwgui/spellbuyingwindow.hpp index 4bc073d14..7c16b116a 100644 --- a/apps/openmw/mwgui/spellswindow.hpp +++ b/apps/openmw/mwgui/spellbuyingwindow.hpp @@ -1,5 +1,5 @@ -#ifndef MWGUI_SPELLSWINDOW_H -#define MWGUI_SPELLSWINDOW_H +#ifndef MWGUI_SpellBuyingWINDOW_H +#define MWGUI_SpellBuyingWINDOW_H #include "container.hpp" #include "window_base.hpp" @@ -20,12 +20,12 @@ namespace MWGui namespace MWGui { - class SpellsWindow : public ContainerBase, public WindowBase + class SpellBuyingWindow : public ContainerBase, public WindowBase { public: - SpellsWindow(MWBase::WindowManager& parWindowManager); + SpellBuyingWindow(MWBase::WindowManager& parWindowManager); - void startSpells(MWWorld::Ptr actor); + void startSpellBuying(MWWorld::Ptr actor); protected: MyGUI::Button* mCancelButton; @@ -36,31 +36,21 @@ namespace MWGui MyGUI::WidgetPtr mSpellsBoxWidget, mSpellsClientWidget; MyGUI::ScrollBar* mSpellsScrollerWidget; + MWWorld::Ptr mActor; + std::map mSpellsWidgetMap; - std::map mSpellsPriceMap; - std::vector mSpellsWidgets; - void onWindowResize(MyGUI::Window* _sender); - void onFilterChanged(MyGUI::Widget* _sender); void onCancelButtonClicked(MyGUI::Widget* _sender); - void onFocus(MyGUI::Widget* _sender, MyGUI::Widget* _old); - void onFocusLost(MyGUI::Widget* _sender, MyGUI::Widget* _old); void onSpellButtonClick(MyGUI::Widget* _sender); - void addSpell(std::string spellID); - void clearSpells(); void updateScroller(); void onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos); void onMouseWheel(MyGUI::Widget* _sender, int _rel); + void addSpell(std::string spellID); + void clearSpells(); int mLastPos,mCurrentY; static const int sLineHeight; - // don't show items that the NPC has equipped in his trade-window. - virtual bool ignoreEquippedItems() { return true; } - - virtual bool isTrading() { return true; } - virtual bool isTradeWindow() { return true; } - void updateLabels(); virtual void onReferenceUnavailable(); diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 012a0e127..dcefd1e71 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -37,7 +37,7 @@ #include "mainmenu.hpp" #include "countdialog.hpp" #include "tradewindow.hpp" -#include "spellswindow.hpp" +#include "spellbuyingwindow.hpp" #include "settingswindow.hpp" #include "confirmationdialog.hpp" #include "alchemywindow.hpp" @@ -62,7 +62,7 @@ WindowManager::WindowManager( , mScrollWindow(NULL) , mCountDialog(NULL) , mTradeWindow(NULL) - , mSpellsWindow(NULL) + , mSpellBuyingWindow(NULL) , mSettingsWindow(NULL) , mConfirmationDialog(NULL) , mAlchemyWindow(NULL) @@ -128,7 +128,7 @@ WindowManager::WindowManager( mMessageBoxManager = new MessageBoxManager(this); mInventoryWindow = new InventoryWindow(*this,mDragAndDrop); mTradeWindow = new TradeWindow(*this); - mSpellsWindow = new SpellsWindow(*this); + mSpellBuyingWindow = new SpellBuyingWindow(*this); mDialogueWindow = new DialogueWindow(*this); mContainerWindow = new ContainerWindow(*this,mDragAndDrop); mHud = new HUD(w,h, mShowFPSLevel, mDragAndDrop); @@ -185,7 +185,7 @@ WindowManager::~WindowManager() delete mBookWindow; delete mScrollWindow; delete mTradeWindow; - delete mSpellsWindow; + delete mSpellBuyingWindow; delete mSettingsWindow; delete mConfirmationDialog; delete mAlchemyWindow; @@ -232,7 +232,7 @@ void WindowManager::updateVisible() mScrollWindow->setVisible(false); mBookWindow->setVisible(false); mTradeWindow->setVisible(false); - mSpellsWindow->setVisible(false); + mSpellBuyingWindow->setVisible(false); mSettingsWindow->setVisible(false); mAlchemyWindow->setVisible(false); mSpellWindow->setVisible(false); @@ -322,8 +322,8 @@ void WindowManager::updateVisible() mInventoryWindow->setVisible(true); mTradeWindow->setVisible(true); break; - case GM_Spells: - mSpellsWindow->setVisible(true); + case GM_SpellBuying: + mSpellBuyingWindow->setVisible(true); break; case GM_InterMessageBox: break; @@ -517,7 +517,7 @@ void WindowManager::onFrame (float frameDuration) mDialogueWindow->checkReferenceAvailable(); mTradeWindow->checkReferenceAvailable(); - mSpellsWindow->checkReferenceAvailable(); + mSpellBuyingWindow->checkReferenceAvailable(); mContainerWindow->checkReferenceAvailable(); mConsole->checkReferenceAvailable(); } @@ -795,7 +795,7 @@ MWGui::ScrollWindow* WindowManager::getScrollWindow() { return mScrollWindow; } MWGui::CountDialog* WindowManager::getCountDialog() { return mCountDialog; } MWGui::ConfirmationDialog* WindowManager::getConfirmationDialog() { return mConfirmationDialog; } MWGui::TradeWindow* WindowManager::getTradeWindow() { return mTradeWindow; } -MWGui::SpellsWindow* WindowManager::getSpellsWindow() { return mSpellsWindow; } +MWGui::SpellBuyingWindow* WindowManager::getSpellBuyingWindow() { return mSpellBuyingWindow; } MWGui::SpellWindow* WindowManager::getSpellWindow() { return mSpellWindow; } MWGui::Console* WindowManager::getConsole() { return mConsole; } diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp index 805107478..a91478bbc 100644 --- a/apps/openmw/mwgui/windowmanagerimp.hpp +++ b/apps/openmw/mwgui/windowmanagerimp.hpp @@ -105,7 +105,7 @@ namespace MWGui virtual MWGui::CountDialog* getCountDialog(); virtual MWGui::ConfirmationDialog* getConfirmationDialog(); virtual MWGui::TradeWindow* getTradeWindow(); - virtual MWGui::SpellsWindow* getSpellsWindow(); + virtual MWGui::SpellBuyingWindow* getSpellBuyingWindow(); virtual MWGui::SpellWindow* getSpellWindow(); virtual MWGui::Console* getConsole(); @@ -213,11 +213,11 @@ namespace MWGui BookWindow* mBookWindow; CountDialog* mCountDialog; TradeWindow* mTradeWindow; - SpellsWindow* mSpellsWindow; // Npc selling spells window + SpellBuyingWindow* mSpellBuyingWindow; SettingsWindow* mSettingsWindow; ConfirmationDialog* mConfirmationDialog; AlchemyWindow* mAlchemyWindow; - SpellWindow* mSpellWindow; // Player owned spells window + SpellWindow* mSpellWindow; QuickKeysMenu* mQuickKeysMenu; CharacterCreation* mCharGen; diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt index 05713c5d1..4a215c50f 100644 --- a/files/mygui/CMakeLists.txt +++ b/files/mygui/CMakeLists.txt @@ -64,7 +64,7 @@ set(MYGUI_FILES openmw_text.skin.xml openmw_tooltips.layout openmw_trade_window.layout - openmw_spells_window.layout + openmw_spell_buying_window.layout openmw_windows.skin.xml openmw_quickkeys_menu.layout openmw_quickkeys_menu_assign.layout diff --git a/files/mygui/openmw_spells_window.layout b/files/mygui/openmw_spell_buying_window.layout similarity index 100% rename from files/mygui/openmw_spells_window.layout rename to files/mygui/openmw_spell_buying_window.layout diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml index e29483e35..3e1a977e5 100644 --- a/files/mygui/openmw_text.skin.xml +++ b/files/mygui/openmw_text.skin.xml @@ -17,6 +17,14 @@ + + + + + + + +