Added spell buying window

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
+    itemselection spellswindow
     )
 
 add_openmw_dir (mwdialogue

apps/openmw/mwbase/windowmanager.hpp

@@ -42,6 +42,7 @@ namespace MWGui
     class Console;
     class SpellWindow;
     class TradeWindow;
+    class SpellsWindow;
     class ConfirmationDialog;
     class CountDialog;
     class ScrollWindow;
@@ -106,6 +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::SpellWindow* getSpellWindow() = 0;
             virtual MWGui::Console* getConsole() = 0;
 

apps/openmw/mwdialogue/dialoguemanagerimp.cpp

@@ -794,6 +794,11 @@ namespace MWDialogue
         else
             win->setShowTrade(false);
 
+        if (services & ESM::NPC::Spells)
+            win->setShowSpells(true);
+        else
+            win->setShowSpells(false);
+
         // sort again, because the previous sort was case-sensitive
         keywordList.sort(stringCompareNoCase);
         win->setKeywords(keywordList);

apps/openmw/mwgui/dialogue.cpp

@@ -17,6 +17,7 @@
 #include "widgets.hpp"
 #include "list.hpp"
 #include "tradewindow.hpp"
+#include "spellswindow.hpp"
 #include "inventorywindow.hpp"
 
 using namespace MWGui;
@@ -46,6 +47,7 @@ DialogueWindow::DialogueWindow(MWBase::WindowManager& parWindowManager)
     : WindowBase("openmw_dialogue_window.layout", parWindowManager)
     , mEnabled(true)
     , mShowTrade(false)
+    , mShowSpells(false)
 {
     // Centre dialog
     center();
@@ -127,6 +129,11 @@ void DialogueWindow::onSelectTopic(std::string topic)
         mWindowManager.pushGuiMode(GM_Barter);
         mWindowManager.getTradeWindow()->startTrade(mPtr);
     }
+    else if (topic == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sSpells")->str)
+    {
+        mWindowManager.pushGuiMode(GM_Spells);
+        mWindowManager.getSpellsWindow()->startSpells(mPtr);
+    }
 
     else
         MWBase::Environment::get().getDialogueManager()->keywordSelected(lower_string(topic));
@@ -148,11 +155,14 @@ void DialogueWindow::setKeywords(std::list<std::string> keyWords)
 {
     mTopicsList->clear();
 
-    bool anyService = mShowTrade;
+    bool anyService = mShowTrade||mShowSpells;
 
     if (mShowTrade)
         mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sBarter")->str);
 
+    if (mShowSpells)
+        mTopicsList->addItem(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sSpells")->str);
+
     if (anyService)
         mTopicsList->addSeparator();
 

apps/openmw/mwgui/dialogue.hpp

@@ -51,6 +51,7 @@ namespace MWGui
         // various service button visibilities, depending if the npc/creature talked to has these services
         // make sure to call these before setKeywords()
         void setShowTrade(bool show) { mShowTrade = show; }
+        void setShowSpells(bool show) { mShowSpells = show; }
 
     protected:
         void onSelectTopic(std::string topic);
@@ -70,6 +71,7 @@ namespace MWGui
 
         // various service button visibilities, depending if the npc/creature talked to has these services
         bool mShowTrade;
+        bool mShowSpells;
 
         bool mEnabled;
 

apps/openmw/mwgui/mode.hpp

@@ -20,6 +20,7 @@ namespace MWGui
       GM_Dialogue,      // NPC interaction
       GM_Barter,
       GM_Rest,
+      GM_Spells,
 
       // Startup character creation dialogs
       GM_Name,

apps/openmw/mwgui/spellswindow.cpp

@@ -0,0 +1,269 @@
+#include "spellswindow.hpp"
+
+#include <boost/lexical_cast.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+#include "../mwbase/soundmanager.hpp"
+#include "../mwbase/windowmanager.hpp"
+
+#include "../mwworld/player.hpp"
+#include "../mwworld/manualref.hpp"
+
+#include "../mwmechanics/spells.hpp"
+#include "../mwmechanics/creaturestats.hpp"
+
+#include "inventorywindow.hpp"
+#include "tradewindow.hpp"
+
+namespace MWGui
+{
+    const int SpellsWindow::sLineHeight = 18;
+
+    SpellsWindow::SpellsWindow(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");
+        getWidget(mSelect, "Select");
+        getWidget(mSpells, "Spells");
+        getWidget(mSpellsBoxWidget, "SpellsBox");
+        getWidget(mSpellsClientWidget, "SpellsClient");
+        getWidget(mSpellsScrollerWidget, "SpellsScroller");
+
+        mSpellsClientWidget->eventMouseWheel += MyGUI::newDelegate(this, &SpellsWindow::onMouseWheel);
+
+        mSpellsScrollerWidget->eventScrollChangePosition += MyGUI::newDelegate(this, &SpellsWindow::onScrollChangePosition);
+
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellsWindow::onCancelButtonClicked);
+
+        int cancelButtonWidth = mCancelButton->getTextSize().width + 24;
+        mCancelButton->setCoord(430-cancelButtonWidth,
+                                mCancelButton->getTop(),
+                                cancelButtonWidth,
+                                mCancelButton->getHeight());
+        mSpells->setCoord(450/2-mSpells->getTextSize().width/2,
+                          mSpells->getTop(),
+                          mSpells->getTextSize().width,
+                          mSpells->getHeight());
+        mSelect->setCoord(8,
+                          mSelect->getTop(),
+                          mSelect->getTextSize().width,
+                          mSelect->getHeight());
+
+        static_cast<MyGUI::Window*>(mMainWidget)->eventWindowChangeCoord += MyGUI::newDelegate(this, &SpellsWindow::onWindowResize);
+    }
+
+    void SpellsWindow::addSpell(std::string spellID)
+    {
+        MyGUI::Button* toAdd;
+
+        toAdd = mSpellsClientWidget->createWidget<MyGUI::Button>("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<const ESM::Spell*, int>(spell,price));
+        if (price>mWindowManager.getInventoryWindow()->getPlayerGold())
+            toAdd->setCaption("#A3997B" + spell->name+"   -   "+boost::lexical_cast<std::string>(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str);
+        else
+            toAdd->setCaption(spell->name+"   -   "+boost::lexical_cast<std::string>(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str);
+        toAdd->setSize(toAdd->getTextSize().width,sLineHeight);
+        toAdd->eventMouseWheel += MyGUI::newDelegate(this, &SpellsWindow::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);
+        mSpellsWidgetMap.insert(std::pair<MyGUI::Widget*, const ESM::Spell*>(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<std::string>(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str);
+        else
+            toUpdate->setCaption("#D8C09A" + spell->name+"   -   "+boost::lexical_cast<std::string>(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str);
+    }
+
+    void SpellsWindow::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);
+        }
+        mSpellsWidgetMap.clear();
+        mSpellsPriceMap.clear();
+    }
+
+    void SpellsWindow::startSpells(MWWorld::Ptr actor)
+    {
+        clearSpells();
+
+        if (actor.getTypeName() == typeid(ESM::NPC).name())
+        {
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+            MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+            MWMechanics::Spells& playerSpells = stats.getSpells();
+            std::vector<std::string> spellList = actor.get<ESM::NPC>()->base->spells.list;
+            for (std::vector<std::string>::const_iterator it = spellList.begin(); it != spellList.end(); ++it)
+            {
+                bool alreadyHave = false;
+                for (std::vector<std::string>::const_iterator it2 = playerSpells.begin(); it2 != playerSpells.end(); ++it2)
+                {
+                    std::string spellname1 = MWBase::Environment::get().getWorld()->getStore().spells.find(*it)->name;
+                    std::string spellname2 = MWBase::Environment::get().getWorld()->getStore().spells.find(*it2)->name;
+                    if (spellname1.compare(spellname2)==0)
+                        alreadyHave = true;
+                }
+                if (alreadyHave==false)
+                    addSpell(*it);
+            }
+        }
+        updateLabels();
+        updateScroller();
+    }
+
+    void SpellsWindow::onSpellButtonClick(MyGUI::Widget* _sender)
+    {
+        const ESM::Spell* spell = mSpellsWidgetMap.find(_sender)->second;
+        int price = mSpellsPriceMap.find(spell)->second;
+
+        if (mWindowManager.getInventoryWindow()->getPlayerGold()>=price)
+        {
+            MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
+            MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player);
+            MWMechanics::Spells& spells = stats.getSpells();
+            spells.add(spell->name);
+            mWindowManager.getTradeWindow()->addOrRemoveGold(-price);
+            mSpellsWidgetMap.erase(_sender);
+            mSpellsPriceMap.erase(spell);
+            for (std::vector<MyGUI::WidgetPtr>::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;i<mSpellsClientWidget->getChildCount();i++)
+            {
+                MyGUI::Widget* toMove;
+                toMove = mSpellsClientWidget->getChildAt(i);
+                toMove->setPosition(0,mCurrentY);
+                mCurrentY+=sLineHeight;
+            }
+        }
+        else
+        {
+            
+        }
+        updateLabels();
+        updateScroller();
+    }
+
+    void SpellsWindow::onWindowResize(MyGUI::Window* _sender)
+    {
+      
+    }
+
+    void SpellsWindow::onCancelButtonClicked(MyGUI::Widget* _sender)
+    {
+        mWindowManager.removeGuiMode(GM_Spells);
+    }
+
+    void SpellsWindow::updateLabels()
+    {
+        mPlayerGold->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str
+            + ": " + boost::lexical_cast<std::string>(mWindowManager.getInventoryWindow()->getPlayerGold()));
+        mPlayerGold->setCoord(8,
+                              mPlayerGold->getTop(),
+                              mPlayerGold->getTextSize().width,
+                              mPlayerGold->getHeight());
+        unsigned int i;
+        for (i=0;i<mSpellsClientWidget->getChildCount();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<std::string>(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str);
+            else
+                toUpdate->setCaption(spell->name+"   -   "+boost::lexical_cast<std::string>(price)+MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sgp")->str);
+        }
+    }
+
+    void SpellsWindow::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_Dialogue);
+    }
+
+    void SpellsWindow::updateScroller()
+    {
+        mSpellsScrollerWidget->setScrollRange(std::max(mCurrentY - mSpellsClientWidget->getHeight(), 0));
+        mSpellsScrollerWidget->setScrollPage(std::max(mSpellsClientWidget->getHeight() - sLineHeight, 0));
+        if (mCurrentY != 0)
+            mSpellsScrollerWidget->setTrackSize( (mSpellsBoxWidget->getHeight() / float(mCurrentY)) * mSpellsScrollerWidget->getLineSize() );
+    }
+
+    void SpellsWindow::onScrollChangePosition(MyGUI::ScrollBar* scroller, size_t pos)
+    {
+        int diff = mLastPos - pos;
+        // Adjust position of all widget according to difference
+        if (diff == 0)
+            return;
+        mLastPos = pos;
+
+        std::vector<MyGUI::WidgetPtr>::const_iterator end = mSpellsWidgets.end();
+        for (std::vector<MyGUI::WidgetPtr>::const_iterator it = mSpellsWidgets.begin(); it != end; ++it)
+        {
+            (*it)->setCoord((*it)->getCoord() + MyGUI::IntPoint(0, diff));
+        }
+    }
+
+    void SpellsWindow::onMouseWheel(MyGUI::Widget* _sender, int _rel)
+    {
+        if (mSpellsScrollerWidget->getScrollPosition() - _rel*0.3 < 0)
+            mSpellsScrollerWidget->setScrollPosition(0);
+        else if (mSpellsScrollerWidget->getScrollPosition() - _rel*0.3 > mSpellsScrollerWidget->getScrollRange()-1)
+            mSpellsScrollerWidget->setScrollPosition(mSpellsScrollerWidget->getScrollRange()-1);
+        else
+            mSpellsScrollerWidget->setScrollPosition(mSpellsScrollerWidget->getScrollPosition() - _rel*0.3);
+
+        onScrollChangePosition(mSpellsScrollerWidget, mSpellsScrollerWidget->getScrollPosition());
+    }
+}

apps/openmw/mwgui/spellswindow.hpp

@@ -0,0 +1,70 @@
+#ifndef MWGUI_SPELLSWINDOW_H
+#define MWGUI_SPELLSWINDOW_H
+
+#include "container.hpp"
+#include "window_base.hpp"
+
+#include "../mwworld/ptr.hpp"
+
+namespace MyGUI
+{
+  class Gui;
+  class Widget;
+}
+
+namespace MWGui
+{
+    class WindowManager;
+}
+
+
+namespace MWGui
+{
+    class SpellsWindow : public ContainerBase, public WindowBase
+    {
+        public:
+            SpellsWindow(MWBase::WindowManager& parWindowManager);
+
+            void startSpells(MWWorld::Ptr actor);
+
+        protected:
+            MyGUI::Button* mCancelButton;
+            MyGUI::TextBox* mPlayerGold;
+            MyGUI::TextBox* mSpells;
+            MyGUI::TextBox* mSelect;
+
+            MyGUI::WidgetPtr mSpellsBoxWidget, mSpellsClientWidget;
+            MyGUI::ScrollBar* mSpellsScrollerWidget;
+
+            std::map<MyGUI::Widget*, const ESM::Spell*> mSpellsWidgetMap;
+            std::map<const ESM::Spell*, int> mSpellsPriceMap;
+            std::vector<MyGUI::WidgetPtr> 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);
+            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();
+    };
+}
+
+#endif

apps/openmw/mwgui/tradewindow.cpp

@@ -136,6 +136,33 @@ namespace MWGui
         drawItems();
     }
 
+    void TradeWindow::addOrRemoveGold(int amount)
+    {
+        bool goldFound = false;
+        MWWorld::Ptr gold;
+        MWWorld::ContainerStore& playerStore = mWindowManager.getInventoryWindow()->getContainerStore();
+        for (MWWorld::ContainerStoreIterator it = playerStore.begin();
+                it != playerStore.end(); ++it)
+        {
+            if (MWWorld::Class::get(*it).getName(*it) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
+            {
+                goldFound = true;
+                gold = *it;
+            }
+        }
+        if (goldFound)
+        {
+            gold.getRefData().setCount(gold.getRefData().getCount() + amount);
+        }
+        else
+        {
+            assert(amount > 0);
+            MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), "Gold_001");
+            ref.getPtr().getRefData().setCount(amount);
+            playerStore.add(ref.getPtr());
+        }
+    }
+
     void TradeWindow::onOfferButtonClicked(MyGUI::Widget* _sender)
     {
         // were there any items traded at all?
@@ -186,29 +213,7 @@ namespace MWGui
         mWindowManager.getInventoryWindow()->transferBoughtItems();
 
         // add or remove gold from the player.
-        bool goldFound = false;
+        addOrRemoveGold(mCurrentBalance);
-        MWWorld::Ptr gold;
-        MWWorld::ContainerStore& playerStore = mWindowManager.getInventoryWindow()->getContainerStore();
-        for (MWWorld::ContainerStoreIterator it = playerStore.begin();
-                it != playerStore.end(); ++it)
-        {
-            if (MWWorld::Class::get(*it).getName(*it) == MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sGold")->str)
-            {
-                goldFound = true;
-                gold = *it;
-            }
-        }
-        if (goldFound)
-        {
-            gold.getRefData().setCount(gold.getRefData().getCount() + mCurrentBalance);
-        }
-        else
-        {
-            assert(mCurrentBalance > 0);
-            MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), "Gold_001");
-            ref.getPtr().getRefData().setCount(mCurrentBalance);
-            playerStore.add(ref.getPtr());
-        }
 
         std::string sound = "Item Gold Up";
         MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);

apps/openmw/mwgui/tradewindow.hpp

@@ -32,6 +32,8 @@ namespace MWGui
 
             bool npcAcceptsItem(MWWorld::Ptr item);
 
+            void addOrRemoveGold(int gold);
+
         protected:
             MyGUI::Button* mFilterAll;
             MyGUI::Button* mFilterWeapon;

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -37,6 +37,7 @@
 #include "mainmenu.hpp"
 #include "countdialog.hpp"
 #include "tradewindow.hpp"
+#include "spellswindow.hpp"
 #include "settingswindow.hpp"
 #include "confirmationdialog.hpp"
 #include "alchemywindow.hpp"
@@ -61,6 +62,7 @@ WindowManager::WindowManager(
   , mScrollWindow(NULL)
   , mCountDialog(NULL)
   , mTradeWindow(NULL)
+  , mSpellsWindow(NULL)
   , mSettingsWindow(NULL)
   , mConfirmationDialog(NULL)
   , mAlchemyWindow(NULL)
@@ -126,6 +128,7 @@ WindowManager::WindowManager(
     mMessageBoxManager = new MessageBoxManager(this);
     mInventoryWindow = new InventoryWindow(*this,mDragAndDrop);
     mTradeWindow = new TradeWindow(*this);
+    mSpellsWindow = new SpellsWindow(*this);
     mDialogueWindow = new DialogueWindow(*this);
     mContainerWindow = new ContainerWindow(*this,mDragAndDrop);
     mHud = new HUD(w,h, mShowFPSLevel, mDragAndDrop);
@@ -182,6 +185,7 @@ WindowManager::~WindowManager()
     delete mBookWindow;
     delete mScrollWindow;
     delete mTradeWindow;
+    delete mSpellsWindow;
     delete mSettingsWindow;
     delete mConfirmationDialog;
     delete mAlchemyWindow;
@@ -228,6 +232,7 @@ void WindowManager::updateVisible()
     mScrollWindow->setVisible(false);
     mBookWindow->setVisible(false);
     mTradeWindow->setVisible(false);
+    mSpellsWindow->setVisible(false);
     mSettingsWindow->setVisible(false);
     mAlchemyWindow->setVisible(false);
     mSpellWindow->setVisible(false);
@@ -317,6 +322,9 @@ void WindowManager::updateVisible()
             mInventoryWindow->setVisible(true);
             mTradeWindow->setVisible(true);
             break;
+        case GM_Spells:
+            mSpellsWindow->setVisible(true);
+            break;
         case GM_InterMessageBox:
             break;
         case GM_Journal:
@@ -509,6 +517,7 @@ void WindowManager::onFrame (float frameDuration)
 
     mDialogueWindow->checkReferenceAvailable();
     mTradeWindow->checkReferenceAvailable();
+    mSpellsWindow->checkReferenceAvailable();
     mContainerWindow->checkReferenceAvailable();
     mConsole->checkReferenceAvailable();
 }
@@ -786,6 +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::SpellWindow* WindowManager::getSpellWindow() { return mSpellWindow; }
 MWGui::Console* WindowManager::getConsole() { return mConsole; }
 

apps/openmw/mwgui/windowmanagerimp.hpp

@@ -105,6 +105,7 @@ namespace MWGui
     virtual MWGui::CountDialog* getCountDialog();
     virtual MWGui::ConfirmationDialog* getConfirmationDialog();
     virtual MWGui::TradeWindow* getTradeWindow();
+    virtual MWGui::SpellsWindow* getSpellsWindow();
     virtual MWGui::SpellWindow* getSpellWindow();
     virtual MWGui::Console* getConsole();
 
@@ -212,10 +213,11 @@ namespace MWGui
     BookWindow* mBookWindow;
     CountDialog* mCountDialog;
     TradeWindow* mTradeWindow;
+    SpellsWindow* mSpellsWindow; // Npc selling spells window
     SettingsWindow* mSettingsWindow;
     ConfirmationDialog* mConfirmationDialog;
     AlchemyWindow* mAlchemyWindow;
-    SpellWindow* mSpellWindow;
+    SpellWindow* mSpellWindow; // Player owned spells window
     QuickKeysMenu* mQuickKeysMenu;
 
     CharacterCreation* mCharGen;

extern/shiny

@@ -1 +1 @@
-Subproject commit 278c6952b5c38e4b2a10205953e379598fad71a0
+Subproject commit 164bc8d3bfe860bd16ad89c0bd1b59f465c9bb24

files/mygui/CMakeLists.txt

@@ -64,6 +64,7 @@ set(MYGUI_FILES
     openmw_text.skin.xml
     openmw_tooltips.layout
     openmw_trade_window.layout
+    openmw_spells_window.layout
     openmw_windows.skin.xml
     openmw_quickkeys_menu.layout
     openmw_quickkeys_menu_assign.layout

files/mygui/openmw_spells_window.layout

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 300" name="_Main">
+        <Property key="Visible" value="false"/>
+
+
+        <Widget type="TextBox" skin="SandText" position="8 10 24 24" name="Select" align="Right Top">
+            <Property key="TextAlign" value="Right"/>
+            <Property key="Caption" value="#{sSpellServiceTitle}"/>
+        </Widget>
+        <Widget type="TextBox" skin="SandText" position="0 0 24 24" name="Spells" align="Right Top">
+            <Property key="TextAlign" value="Right"/>
+            <Property key="Caption" value="#D8C09A#{sSpells}"/>
+        </Widget>
+
+
+        <Widget type="Widget" skin="MW_Box" position="6 31 430 225" align="ALIGN_LEFT ALIGN_STRETCH" name="SpellsBox">
+            <Widget type="Widget" skin="" position="4 4 404 217" align="ALIGN_LEFT ALIGN_TOP ALIGN_STRETCH" name="SpellsClient" />
+            <Widget type="ScrollBar" skin="MW_VScroll" position="412 4 14 217" align="ALIGN_RIGHT ALIGN_VSTRETCH" name="SpellsScroller" />
+        </Widget>
+
+
+        <Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top">
+            <Property key="TextAlign" value="Right"/>
+        </Widget>
+        <Widget type="Button" skin="MW_Button" position="290 260 60 24" name="CancelButton" align="Right Top">
+            <Property key="Caption" value="#{sOK}"/>
+        </Widget>
+
+    </Widget>
+
+</MyGUI>