From e8210c92c688d527db9a24df475161fef259ac47 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 04:27:26 +0200
Subject: [PATCH 01/12] Fixes #1240: Don't hardcode drowning time

---
 apps/openmw/mwbase/windowmanager.hpp            | 5 +++--
 apps/openmw/mwgui/hud.cpp                       | 4 ++--
 apps/openmw/mwgui/hud.hpp                       | 5 +++--
 apps/openmw/mwgui/windowmanagerimp.cpp          | 4 ++--
 apps/openmw/mwgui/windowmanagerimp.hpp          | 5 +++--
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 6 ++++--
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index e3bd428e2..eb84741c4 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -156,8 +156,9 @@ namespace MWBase
             virtual void setValue (const std::string& id, int value) = 0;
 
             /// Set time left for the player to start drowning (update the drowning bar)
-            /// @param time value from [0,20]
-            virtual void setDrowningTimeLeft (float time) =0;
+            /// @param time time left to start drowning
+            /// @param maxTime how long we can be underwater (in total) until drowning starts
+            virtual void setDrowningTimeLeft (float time, float maxTime) = 0;
 
             virtual void setPlayerClass (const ESM::Class &class_) = 0;
             ///< set current class of player
diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 02cc5c6a9..946259e10 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -203,9 +203,9 @@ namespace MWGui
         }
     }
 
-    void HUD::setDrowningTimeLeft(float time)
+    void HUD::setDrowningTimeLeft(float time, float maxTime)
     {
-        size_t progress = time/20.0*200.0;
+        size_t progress = time/maxTime*200.0;
         mDrowning->setProgressPosition(progress);
 
         bool isDrowning = (progress == 0);
diff --git a/apps/openmw/mwgui/hud.hpp b/apps/openmw/mwgui/hud.hpp
index 38535630f..973ac0745 100644
--- a/apps/openmw/mwgui/hud.hpp
+++ b/apps/openmw/mwgui/hud.hpp
@@ -22,8 +22,9 @@ namespace MWGui
         void setBatchCount(unsigned int count);
 
         /// Set time left for the player to start drowning
-        /// @param time value from [0,20]
-        void setDrowningTimeLeft(float time);
+        /// @param time time left to start drowning
+        /// @param maxTime how long we can be underwater (in total) until drowning starts
+        void setDrowningTimeLeft(float time, float maxTime);
         void setDrowningBarVisible(bool visible);
 
         void setHmsVisible(bool visible);
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 0457fcb59..2ed113126 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -625,9 +625,9 @@ namespace MWGui
         mStatsWindow->setValue (id, value);
     }
 
-    void WindowManager::setDrowningTimeLeft (float time)
+    void WindowManager::setDrowningTimeLeft (float time, float maxTime)
     {
-        mHud->setDrowningTimeLeft(time);
+        mHud->setDrowningTimeLeft(time, maxTime);
     }
 
     void WindowManager::setPlayerClass (const ESM::Class &class_)
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index ab9770a41..074cb3208 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -166,8 +166,9 @@ namespace MWGui
     virtual void setValue (const std::string& id, int value);
 
     /// Set time left for the player to start drowning (update the drowning bar)
-    /// @param time value from [0,20]
-    virtual void setDrowningTimeLeft (float time);
+    /// @param time time left to start drowning
+    /// @param maxTime how long we can be underwater (in total) until drowning starts
+    virtual void setDrowningTimeLeft (float time, float maxTime);
 
     virtual void setPlayerClass (const ESM::Class &class_);                        ///< set current class of player
     virtual void configureSkills (const SkillList& major, const SkillList& minor); ///< configure skill groups, each set contains the skill ID for that group.
diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index ff9bacf7b..34402977c 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -298,13 +298,15 @@ namespace MWMechanics
 
             if(stats.getTimeToStartDrowning() != mWatchedStats.getTimeToStartDrowning())
             {
+                const float fHoldBreathTime = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>()
+                        .find("fHoldBreathTime")->getFloat();
                 mWatchedStats.setTimeToStartDrowning(stats.getTimeToStartDrowning());
-                if(stats.getTimeToStartDrowning() >= 20.0f)
+                if(stats.getTimeToStartDrowning() >= fHoldBreathTime)
                     winMgr->setDrowningBarVisibility(false);
                 else
                 {
                     winMgr->setDrowningBarVisibility(true);
-                    winMgr->setDrowningTimeLeft(stats.getTimeToStartDrowning());
+                    winMgr->setDrowningTimeLeft(stats.getTimeToStartDrowning(), fHoldBreathTime);
                 }
             }
 

From 93b76a603b5128ebd4da0787f6ea77bad2ccb0c9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 05:40:07 +0200
Subject: [PATCH 02/12] Fixes #1100: Looting a corpse is no longer considered
 stealing

---
 apps/openmw/mwgui/companionitemmodel.cpp |  4 ++--
 apps/openmw/mwgui/companionitemmodel.hpp |  2 +-
 apps/openmw/mwgui/container.cpp          | 13 ++++++++-----
 apps/openmw/mwgui/containeritemmodel.cpp |  2 +-
 apps/openmw/mwgui/containeritemmodel.hpp |  2 +-
 apps/openmw/mwgui/inventoryitemmodel.cpp | 18 ++++++++++++++++--
 apps/openmw/mwgui/inventoryitemmodel.hpp |  5 ++++-
 apps/openmw/mwgui/itemmodel.cpp          | 10 ++++++++--
 apps/openmw/mwgui/itemmodel.hpp          |  8 ++++++--
 apps/openmw/mwgui/tradeitemmodel.cpp     |  9 +++------
 apps/openmw/mwworld/containerstore.cpp   | 15 ++++++++++++---
 11 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/apps/openmw/mwgui/companionitemmodel.cpp b/apps/openmw/mwgui/companionitemmodel.cpp
index bb6cf2800..9c4ea2d29 100644
--- a/apps/openmw/mwgui/companionitemmodel.cpp
+++ b/apps/openmw/mwgui/companionitemmodel.cpp
@@ -10,7 +10,7 @@ namespace MWGui
     {
     }
 
-    void CompanionItemModel::copyItem (const ItemStack& item, size_t count)
+    void CompanionItemModel::copyItem (const ItemStack& item, size_t count, bool setNewOwner=false)
     {
         if (mActor.getClass().isNpc())
         {
@@ -18,7 +18,7 @@ namespace MWGui
             stats.modifyProfit(MWWorld::Class::get(item.mBase).getValue(item.mBase) * count);
         }
 
-        InventoryItemModel::copyItem(item, count);
+        InventoryItemModel::copyItem(item, count, setNewOwner);
     }
 
     void CompanionItemModel::removeItem (const ItemStack& item, size_t count)
diff --git a/apps/openmw/mwgui/companionitemmodel.hpp b/apps/openmw/mwgui/companionitemmodel.hpp
index c11e11c32..49c58c896 100644
--- a/apps/openmw/mwgui/companionitemmodel.hpp
+++ b/apps/openmw/mwgui/companionitemmodel.hpp
@@ -13,7 +13,7 @@ namespace MWGui
     public:
         CompanionItemModel (const MWWorld::Ptr& actor);
 
-        virtual void copyItem (const ItemStack& item, size_t count);
+        virtual void copyItem (const ItemStack& item, size_t count, bool setNewOwner);
         virtual void removeItem (const ItemStack& item, size_t count);
     };
 
diff --git a/apps/openmw/mwgui/container.cpp b/apps/openmw/mwgui/container.cpp
index 34ac8d9f4..585647338 100644
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@@ -13,6 +13,7 @@
 #include "../mwworld/containerstore.hpp"
 
 #include "../mwmechanics/pickpocket.hpp"
+#include "../mwmechanics/creaturestats.hpp"
 
 #include "countdialog.hpp"
 #include "tradewindow.hpp"
@@ -84,8 +85,7 @@ namespace MWGui
         // otherwise, do the transfer
         if (targetModel != mSourceModel)
         {
-            targetModel->copyItem(mItem, mDraggedCount);
-            mSourceModel->removeItem(mItem, mDraggedCount);
+            mSourceModel->moveItem(mItem, mDraggedCount, targetModel);
         }
 
         mSourceModel->update();
@@ -292,8 +292,7 @@ namespace MWGui
                 if (!onTakeItem(item, item.mCount))
                     break;
 
-                playerModel->copyItem(item, item.mCount);
-                mModel->removeItem(item, item.mCount);
+                mModel->moveItem(item, item.mCount, playerModel);
             }
 
             MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Container);
@@ -341,7 +340,11 @@ namespace MWGui
         }
         else
         {
-            MWBase::Environment::get().getMechanicsManager()->itemTaken(player, item.mBase, count);
+            // Looting a dead corpse is considered OK
+            if (mPtr.getClass().isActor() && mPtr.getClass().getCreatureStats(mPtr).isDead())
+                return true;
+            else
+                MWBase::Environment::get().getMechanicsManager()->itemTaken(player, item.mBase, count);
         }
         return true;
     }
diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index bcb8440bf..e702c073d 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -71,7 +71,7 @@ ItemModel::ModelIndex ContainerItemModel::getIndex (ItemStack item)
     return -1;
 }
 
-void ContainerItemModel::copyItem (const ItemStack& item, size_t count)
+void ContainerItemModel::copyItem (const ItemStack& item, size_t count, bool setNewOwner)
 {
     const MWWorld::Ptr& source = mItemSources[mItemSources.size()-1];
     if (item.mBase.getContainerStore() == &source.getClass().getContainerStore(source))
diff --git a/apps/openmw/mwgui/containeritemmodel.hpp b/apps/openmw/mwgui/containeritemmodel.hpp
index 22595582e..4b9b4ff99 100644
--- a/apps/openmw/mwgui/containeritemmodel.hpp
+++ b/apps/openmw/mwgui/containeritemmodel.hpp
@@ -21,7 +21,7 @@ namespace MWGui
         virtual ModelIndex getIndex (ItemStack item);
         virtual size_t getItemCount();
 
-        virtual void copyItem (const ItemStack& item, size_t count);
+        virtual void copyItem (const ItemStack& item, size_t count, bool setNewOwner=false);
         virtual void removeItem (const ItemStack& item, size_t count);
 
         virtual void update();
diff --git a/apps/openmw/mwgui/inventoryitemmodel.cpp b/apps/openmw/mwgui/inventoryitemmodel.cpp
index 97e1e9a2b..c0847929b 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.cpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.cpp
@@ -4,6 +4,8 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
 
+#include "../mwmechanics/creaturestats.hpp"
+
 namespace MWGui
 {
 
@@ -38,11 +40,11 @@ ItemModel::ModelIndex InventoryItemModel::getIndex (ItemStack item)
     return -1;
 }
 
-void InventoryItemModel::copyItem (const ItemStack& item, size_t count)
+void InventoryItemModel::copyItem (const ItemStack& item, size_t count, bool setNewOwner)
 {
     if (item.mBase.getContainerStore() == &mActor.getClass().getContainerStore(mActor))
         throw std::runtime_error("Item to copy needs to be from a different container!");
-    mActor.getClass().getContainerStore(mActor).add(item.mBase, count, mActor);
+    mActor.getClass().getContainerStore(mActor).add(item.mBase, count, mActor, setNewOwner);
 }
 
 
@@ -57,6 +59,18 @@ void InventoryItemModel::removeItem (const ItemStack& item, size_t count)
         throw std::runtime_error("Not enough items in the stack to remove");
 }
 
+void InventoryItemModel::moveItem(const ItemStack &item, size_t count, ItemModel *otherModel)
+{
+    bool setNewOwner = false;
+
+    // Are you dead? Then you wont need that anymore
+    if (mActor.getClass().isActor() && mActor.getClass().getCreatureStats(mActor).isDead())
+        setNewOwner = true;
+
+    otherModel->copyItem(item, count, setNewOwner);
+    removeItem(item, count);
+}
+
 void InventoryItemModel::update()
 {
     MWWorld::ContainerStore& store = MWWorld::Class::get(mActor).getContainerStore(mActor);
diff --git a/apps/openmw/mwgui/inventoryitemmodel.hpp b/apps/openmw/mwgui/inventoryitemmodel.hpp
index 23856395e..78dcc9497 100644
--- a/apps/openmw/mwgui/inventoryitemmodel.hpp
+++ b/apps/openmw/mwgui/inventoryitemmodel.hpp
@@ -15,9 +15,12 @@ namespace MWGui
         virtual ModelIndex getIndex (ItemStack item);
         virtual size_t getItemCount();
 
-        virtual void copyItem (const ItemStack& item, size_t count);
+        virtual void copyItem (const ItemStack& item, size_t count, bool setNewOwner=false);
         virtual void removeItem (const ItemStack& item, size_t count);
 
+        /// Move items from this model to \a otherModel.
+        virtual void moveItem (const ItemStack& item, size_t count, ItemModel* otherModel);
+
         virtual void update();
 
     protected:
diff --git a/apps/openmw/mwgui/itemmodel.cpp b/apps/openmw/mwgui/itemmodel.cpp
index 58e89c4fc..7b2ea4d4a 100644
--- a/apps/openmw/mwgui/itemmodel.cpp
+++ b/apps/openmw/mwgui/itemmodel.cpp
@@ -71,16 +71,22 @@ namespace MWGui
     {
     }
 
+    void ItemModel::moveItem(const ItemStack &item, size_t count, ItemModel *otherModel)
+    {
+        otherModel->copyItem(item, count);
+        removeItem(item, count);
+    }
+
 
     ProxyItemModel::~ProxyItemModel()
     {
         delete mSourceModel;
     }
 
-    void ProxyItemModel::copyItem (const ItemStack& item, size_t count)
+    void ProxyItemModel::copyItem (const ItemStack& item, size_t count, bool setNewOwner)
     {
         // no need to use mapToSource since itemIndex refers to an index in the sourceModel
-        mSourceModel->copyItem (item, count);
+        mSourceModel->copyItem (item, count, setNewOwner);
     }
 
     void ProxyItemModel::removeItem (const ItemStack& item, size_t count)
diff --git a/apps/openmw/mwgui/itemmodel.hpp b/apps/openmw/mwgui/itemmodel.hpp
index 47aaf79e8..684771b86 100644
--- a/apps/openmw/mwgui/itemmodel.hpp
+++ b/apps/openmw/mwgui/itemmodel.hpp
@@ -55,7 +55,11 @@ namespace MWGui
 
         virtual void update() = 0;
 
-        virtual void copyItem (const ItemStack& item, size_t count) = 0;
+        /// Move items from this model to \a otherModel.
+        virtual void moveItem (const ItemStack& item, size_t count, ItemModel* otherModel);
+
+        /// @param setNewOwner Set the copied item's owner to the actor we are copying to, or keep the original owner?
+        virtual void copyItem (const ItemStack& item, size_t count, bool setNewOwner=false) = 0;
         virtual void removeItem (const ItemStack& item, size_t count) = 0;
 
     private:
@@ -69,7 +73,7 @@ namespace MWGui
     {
     public:
         virtual ~ProxyItemModel();
-        virtual void copyItem (const ItemStack& item, size_t count);
+        virtual void copyItem (const ItemStack& item, size_t count, bool setNewOwner=false);
         virtual void removeItem (const ItemStack& item, size_t count);
         virtual ModelIndex getIndex (ItemStack item);
 
diff --git a/apps/openmw/mwgui/tradeitemmodel.cpp b/apps/openmw/mwgui/tradeitemmodel.cpp
index c9c65a152..ad18a13e8 100644
--- a/apps/openmw/mwgui/tradeitemmodel.cpp
+++ b/apps/openmw/mwgui/tradeitemmodel.cpp
@@ -120,14 +120,11 @@ namespace MWGui
             if (i == sourceModel->getItemCount())
                 throw std::runtime_error("The borrowed item disappeared");
 
-            // reset owner before copying
+            // reset owner while copying, but only for items bought by the player
+            bool setNewOwner = (mMerchant.isEmpty());
             const ItemStack& item = sourceModel->getItem(i);
-            std::string owner = item.mBase.getCellRef().mOwner;
-            if (mMerchant.isEmpty()) // only for items bought by player
-                item.mBase.getCellRef().mOwner = "";
             // copy the borrowed items to our model
-            copyItem(item, it->mCount);
-            item.mBase.getCellRef().mOwner = owner;
+            copyItem(item, it->mCount, setNewOwner);
             // then remove them from the source model
             sourceModel->removeItem(item, it->mCount);
         }
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index bd0704724..dd2f2f3c1 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -199,16 +199,25 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
     item.getCellRef().mPos.pos[1] = 0;
     item.getCellRef().mPos.pos[2] = 0;
 
+    Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+
     if (setOwner && actorPtr.getClass().isActor())
-        item.getCellRef().mOwner = actorPtr.getCellRef().mRefID;
+    {
+        if (actorPtr == player)
+        {
+            // No point in setting owner to the player - NPCs will not respect this anyway
+            // Additionally, setting it to "player" would make those items not stack with items that don't have an owner
+            item.getCellRef().mOwner = "";
+        }
+        else
+            item.getCellRef().mOwner = actorPtr.getCellRef().mRefID;
+    }
 
     std::string script = MWWorld::Class::get(item).getScript(item);
     if(script != "")
     {
         CellStore *cell;
 
-        Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-
         if(&(MWWorld::Class::get (player).getContainerStore (player)) == this)
         {
             cell = 0; // Items in player's inventory have cell set to 0, so their scripts will never be removed

From d92f95f5bf6f524bafb29a0435c658e4ac4c6c86 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 05:54:19 +0200
Subject: [PATCH 03/12] Fix a stacking issue

---
 apps/openmw/mwworld/containerstore.cpp | 45 +++++++++++++++++---------
 1 file changed, 29 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index dd2f2f3c1..b1cbcc9c2 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -187,11 +187,38 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add(const std::string &
 
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr, int count, const Ptr& actorPtr, bool setOwner)
 {
-    MWWorld::ContainerStoreIterator it = addImp(itemPtr, count);
+    Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
+
+    MWWorld::ContainerStoreIterator it = end();
+
+    if (setOwner && actorPtr.getClass().isActor())
+    {
+        // HACK: Set owner on the original item, then reset it after we have copied it
+        // If we set the owner on the copied item, it would not stack correctly...
+        std::string oldOwner = itemPtr.getCellRef().mOwner;
+        if (actorPtr == player)
+        {
+            // No point in setting owner to the player - NPCs will not respect this anyway
+            // Additionally, setting it to "player" would make those items not stack with items that don't have an owner
+            itemPtr.getCellRef().mOwner = "";
+        }
+        else
+            itemPtr.getCellRef().mOwner = actorPtr.getCellRef().mRefID;
+
+        it = addImp(itemPtr, count);
+
+        itemPtr.getCellRef().mOwner = oldOwner;
+    }
+    else
+    {
+        it = addImp(itemPtr, count);
+    }
+
+    // The copy of the original item we just made
     MWWorld::Ptr item = *it;
 
     // we may have copied an item from the world, so reset a few things first
-    item.getRefData().setBaseNode(NULL);
+    item.getRefData().setBaseNode(NULL); // Especially important, otherwise scripts on the item could think that it's actually in a cell
     item.getCellRef().mPos.rot[0] = 0;
     item.getCellRef().mPos.rot[1] = 0;
     item.getCellRef().mPos.rot[2] = 0;
@@ -199,20 +226,6 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& itemPtr
     item.getCellRef().mPos.pos[1] = 0;
     item.getCellRef().mPos.pos[2] = 0;
 
-    Ptr player = MWBase::Environment::get().getWorld ()->getPlayerPtr();
-
-    if (setOwner && actorPtr.getClass().isActor())
-    {
-        if (actorPtr == player)
-        {
-            // No point in setting owner to the player - NPCs will not respect this anyway
-            // Additionally, setting it to "player" would make those items not stack with items that don't have an owner
-            item.getCellRef().mOwner = "";
-        }
-        else
-            item.getCellRef().mOwner = actorPtr.getCellRef().mRefID;
-    }
-
     std::string script = MWWorld::Class::get(item).getScript(item);
     if(script != "")
     {

From dd14dec8dc3b82a89322cc46027d910c3916ff41 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 08:16:35 +0200
Subject: [PATCH 04/12] Tweak loading screen progress bar positioning to match
 vanilla

---
 files/mygui/openmw_loading_screen.layout | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/files/mygui/openmw_loading_screen.layout b/files/mygui/openmw_loading_screen.layout
index 19649cfd2..faa0d8637 100644
--- a/files/mygui/openmw_loading_screen.layout
+++ b/files/mygui/openmw_loading_screen.layout
@@ -4,13 +4,13 @@
     <!-- The entire screen -->
     <Widget type="Widget" layer="LoadingScreen" position="0 0 300 300" name="_Main">
 
-        <Widget type="Widget" skin="HUD_Box" position="0 200 300 60" align="Bottom HCenter">
+        <Widget type="Widget" skin="HUD_Box" position="0 245 300 48" align="Bottom HCenter">
 
-            <Widget type="TextBox" skin="SandText" position="20 12 260 20" name="LoadingText">
+            <Widget type="TextBox" skin="SandText" position="20 8 260 18" name="LoadingText">
                 <Property key="TextAlign" value="Center"/>
             </Widget>
 
-            <Widget type="ScrollBar" skin="MW_ProgressScroll_Loading" position="20 36 260 8" name="ProgressBar">
+            <Widget type="ScrollBar" skin="MW_ProgressScroll_Loading" position="20 30 260 6" name="ProgressBar">
             </Widget>
 
         </Widget>

From 14757a856b6077ab2f00f3fa2b94974efb776a9a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 08:17:14 +0200
Subject: [PATCH 05/12] Tweak settings window size and encumbrance bar text
 align

---
 files/mygui/openmw_settings_window.layout | 6 +++---
 files/mygui/openmw_text.skin.xml          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/files/mygui/openmw_settings_window.layout b/files/mygui/openmw_settings_window.layout
index e348323be..bcf4374a4 100644
--- a/files/mygui/openmw_settings_window.layout
+++ b/files/mygui/openmw_settings_window.layout
@@ -3,10 +3,10 @@
 <MyGUI type="Layout">
     <Widget type="Window" skin="MW_Window_NoCaption" layer="Windows" position="0 0 400 426" name="_Main">
 
-        <Property key="MinSize" value="400 496"/>
-        <Property key="MaxSize" value="400 496"/>
+        <Property key="MinSize" value="400 446"/>
+        <Property key="MaxSize" value="400 446"/>
 
-        <Widget type="TabControl" skin="TabControl" position="8 8 368 410" align="Left Top" name="SettingsTab">
+        <Widget type="TabControl" skin="TabControl" position="8 8 368 360" align="Left Top" name="SettingsTab">
             <Property key="ButtonAutoWidth" value="true"/>
 
             <Widget type="TabItem" skin="" position="4 28 360 312">
diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml
index 15287bc74..d75abc873 100644
--- a/files/mygui/openmw_text.skin.xml
+++ b/files/mygui/openmw_text.skin.xml
@@ -152,7 +152,7 @@
 
     <Skin name="MW_ChargeBar_Blue" size="204 18">
         <Child type="ProgressBar" skin="MW_Progress_Blue" offset="0 0 204 18" align="Right Top Stretch" name="Bar"/>
-        <Child type="TextBox" skin="SandTextC" offset="0 0 204 18" align="Right Top Stretch" name="BarText"/>
+        <Child type="TextBox" skin="SandTextC" offset="0 2 204 18" align="Right Top Stretch" name="BarText"/>
     </Skin>
 
     <Skin name="MW_DynamicStat_Red" size="204 18">

From 3161647809b31c8e97802d6fe7a058084a4acd4b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 09:12:49 +0200
Subject: [PATCH 06/12] Fix for not being able to pick up scrolls during combat

This is the behaviour I observed in vanilla morrowind.
---
 apps/openmw/mwworld/actionread.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/actionread.cpp b/apps/openmw/mwworld/actionread.cpp
index 433237e26..60af3d9b9 100644
--- a/apps/openmw/mwworld/actionread.cpp
+++ b/apps/openmw/mwworld/actionread.cpp
@@ -3,7 +3,6 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwworld/player.hpp"
 
@@ -24,7 +23,12 @@ namespace MWWorld
 
     void ActionRead::executeImp (const MWWorld::Ptr& actor) {
 
-        if(MWBase::Environment::get().getWorld()->getPlayer().isInCombat()) { //Ensure we're not in combat
+        //Ensure we're not in combat
+        if(MWBase::Environment::get().getWorld()->getPlayer().isInCombat()
+                // Reading in combat is still allowed if the scroll/book is not in the player inventory yet
+                // (since otherwise, there would be no way to pick it up)
+                && getTarget().getContainerStore() == &actor.getClass().getContainerStore(actor)
+                ) {
             MWBase::Environment::get().getWindowManager()->messageBox("#{sInventoryMessage4}");
             return;
         }

From dac0b7090abc046a938f38de5597987455c8bdec Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 09:14:14 +0200
Subject: [PATCH 07/12] Get rid of bigbars.png and smallbars.png

Changed loading bar colour to match vanilla
---
 apps/openmw/mwgui/hud.cpp                 |   2 +-
 files/mygui/CMakeLists.txt                |   2 -
 files/mygui/bigbars.png                   | Bin 387 -> 0 bytes
 files/mygui/openmw_hud.layout             |   2 +-
 files/mygui/openmw_hud_energybar.skin.xml |  28 ++++++-----
 files/mygui/openmw_progress.skin.xml      |  57 +++++++++++++---------
 files/mygui/smallbars.png                 | Bin 2985 -> 0 bytes
 7 files changed, 53 insertions(+), 38 deletions(-)
 delete mode 100644 files/mygui/bigbars.png
 delete mode 100644 files/mygui/smallbars.png

diff --git a/apps/openmw/mwgui/hud.cpp b/apps/openmw/mwgui/hud.cpp
index 946259e10..be4a9a14e 100644
--- a/apps/openmw/mwgui/hud.cpp
+++ b/apps/openmw/mwgui/hud.cpp
@@ -625,7 +625,7 @@ namespace MWGui
         if (mIsDrowning)
         {
             float intensity = (cos(mDrowningFlashTheta) + 1.0f) / 2.0f;
-            mDrowningFlash->setColour(MyGUI::Colour(intensity, intensity, intensity));
+            mDrowningFlash->setColour(MyGUI::Colour(intensity, 0, 0));
         }
     }
 
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index ef223a617..2135f4dde 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -4,7 +4,6 @@ set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui)
 
 set(MYGUI_FILES
-    bigbars.png
     black.png
     core.skin
     core.xml
@@ -81,7 +80,6 @@ set(MYGUI_FILES
     openmw_companion_window.layout
     openmw_savegame_dialog.layout
     openmw_recharge_dialog.layout
-    smallbars.png
     DejaVuLGCSansMono.ttf
     markers.png
     ../launcher/images/openmw.png
diff --git a/files/mygui/bigbars.png b/files/mygui/bigbars.png
deleted file mode 100644
index ee91da19e3bc85b5601375d9e84fb45384da5ced..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 387
zcmV-}0et?6P)<h;3K|Lk000e1NJLTq000C4002D*0ssI21?FE&00001b5ch_0Itp)
z=>Px#32;bRa{vGf6951U69E94oEQKA00(qQO+^RU0tXKrA*QRh;Q#;u6-h)vR4C7N
zl1)wnF${%2XN-{8vEl|uY&aALV8>}VBdAn`cJkxLqBD~e)GQ)>vg15I+uolaSdS;O
z4xR{+j1Vb@0?xPZO7ygk(gv6Z_#7j-sl)L<7zq3n0&bJdA+IK&N*D<UZPgy%dI1|%
z+cZfsGf5t`kdj)ElGk$RX(jIln7_uzzC+Y9K%2+N3}A-j5gD*_qbMF$0aO>&Xp!xQ
zm%Cm72Q7U&ZUiI<oH>|`A|`Xb>+oiu2iT2p7=&^h=0hH)z$sw+v@{GnQNl3+)V8T!
z-#p#FUf7FtZaXao0A?Qbv`*13P5fi;V0_I#qrLf>*DV8Plhih^C#ktCkfeaK>Mj&x
h-3y1lAs1=a;TPg<to~Z%D0Kh;002ovPDHLkV1kgtm1Y0{

diff --git a/files/mygui/openmw_hud.layout b/files/mygui/openmw_hud.layout
index 72d337e45..4f93b42f8 100644
--- a/files/mygui/openmw_hud.layout
+++ b/files/mygui/openmw_hud.layout
@@ -42,7 +42,7 @@
                 <Property key="TextShadow" value="true"/>
                 <Property key="TextShadowColour" value="0 0 0"/>
             </Widget>
-            <Widget type="ProgressBar" skin="MW_Progress_Loading" position="12 36 196 8" align="Center Top" name="Drowning">
+            <Widget type="ProgressBar" skin="MW_Progress_LightBlue" position="12 36 196 8" align="Center Top" name="Drowning">
                 <Property key="NeedMouse" value="false"/>
             </Widget>
             <Widget type="Widget" skin="MW_Progress_Drowning" position="14 38 192 4" align="Center Top" name="Flash"/>
diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml
index f10908d7b..d5078e994 100644
--- a/files/mygui/openmw_hud_energybar.skin.xml
+++ b/files/mygui/openmw_hud_energybar.skin.xml
@@ -19,24 +19,28 @@
     </Skin>
 
     <!-- Progress bar track, various colors -->
-    <Skin name="MW_BarTrack_Red" size="4 8" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch">
-            <State name="normal" offset="0 0 4 8"/>
+    <Skin name="MW_BarTrack_Red" size="4 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.8274 0.2431 0.129"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BarTrack_Green" size="4 8" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch">
-            <State name="normal" offset="0 16 4 8"/>
+    <Skin name="MW_BarTrack_Green" size="4 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0 0.6823 0.2745"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BarTrack_Blue" size="4 8" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch">
-            <State name="normal" offset="0 8 4 8"/>
+    <Skin name="MW_BarTrack_Blue" size="4 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.2470 0.3176 0.7411"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BarTrack_Yellow" size="4 8" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch">
-            <State name="normal" offset="0 32 4 8"/>
+    <Skin name="MW_BarTrack_Yellow" size="4 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="1 1 0"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
 
diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml
index f5418e3f8..a09011e10 100644
--- a/files/mygui/openmw_progress.skin.xml
+++ b/files/mygui/openmw_progress.skin.xml
@@ -2,35 +2,48 @@
 
 <MyGUI type="Skin">
     <!-- Progress bar track, various colors -->
-    <Skin name="MW_BigTrack_Red" size="2 14" texture="bigbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch">
-            <State name="normal" offset="0 0 2 14"/>
+    <Skin name="MW_Track_Red" size="16 16" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.8274 0.2431 0.129"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BigTrack_Blue" size="2 14" texture="bigbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch">
-            <State name="normal" offset="0 14 2 14"/>
+    <Skin name="MW_Track_Blue" size="2 14" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.2470 0.3176 0.7411"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BigTrack_Green" size="2 14" texture="bigbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch">
-            <State name="normal" offset="0 28 2 14"/>
+    <Skin name="MW_Track_Green" size="2 14" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0 0.6823 0.2745"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
+            <State name="normal" offset="0 0 16 16"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BigTrack_Progress_Red_Small" size="2 6" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 6" align="Stretch">
-            <State name="normal" offset="0 0 2 8"/>
+    <!-- Lighter variants (only uses top half of the gradient) -->
+    <Skin name="MW_BigTrack_Progress_Red_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="1 0 0"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
-    <Skin name="MW_BigTrack_Progress_Blue_Small" size="2 6" texture="smallbars.png" >
-        <BasisSkin type="MainSkin" offset="0 0 2 6" align="Stretch">
-            <State name="normal" offset="0 26 2 6"/>
+    <Skin name="MW_BigTrack_Progress_Blue_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.3 0.3 1"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
+        </BasisSkin>
+    </Skin>
+    <Skin name="MW_BigTrack_Progress_Green_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
+        <Property key="Colour" value="0.298 0.784 0.780"/>
+        <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
+            <State name="normal" offset="0 0 16 8"/>
         </BasisSkin>
     </Skin>
 
+
     <Skin name="ProgressText" size="16 16">
         <Property key="FontName" value="Default"/>
-        <Property key="TextAlign" value="Center"/>
+        <Property key="TextAlign" value="Top HCenter"/>
         <Property key="TextColour" value="0.75 0.6 0.35"/>
 
         <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
@@ -39,7 +52,7 @@
     <!-- Main energy bar widget definitions. There's one for each color.-->
 
     <Skin name="MW_Progress_Red" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Red"/>
+        <Property key="TrackSkin" value="MW_Track_Red"/>
         <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
@@ -47,7 +60,7 @@
     </Skin>
 
     <Skin name="MW_Progress_Green" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Green"/>
+        <Property key="TrackSkin" value="MW_Track_Green"/>
         <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
@@ -55,15 +68,15 @@
     </Skin>
 
     <Skin name="MW_Progress_Blue" size="64 12">
-        <Property key="TrackSkin" value="MW_BigTrack_Blue"/>
+        <Property key="TrackSkin" value="MW_Track_Blue"/>
         <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
         <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
     </Skin>
 
-    <Skin name="MW_Progress_Loading" size="64 6">
-    <Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small"/>
+    <Skin name="MW_Progress_LightBlue" size="64 6">
+        <Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small"/>
         <Property key="TrackWidth" value="1"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="Stretch"/>
@@ -82,7 +95,7 @@
         <Property key="MoveToClick" value="false"/>
 
         <Child type="Widget" skin="BlackBG" offset="2 2 60 2" align="Stretch" name="Client"/>
-        <Child type="Button" skin="MW_BigTrack_Progress_Blue_Small" offset="0 0 1 6" align="Left VStretch" name="Track"/>
+        <Child type="Button" skin="MW_BigTrack_Progress_Green_Small" offset="0 0 1 6" align="Left VStretch" name="Track"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="Stretch"/>
     </Skin>
diff --git a/files/mygui/smallbars.png b/files/mygui/smallbars.png
deleted file mode 100644
index 3c007a55cea32c99bbb4acb41e27419cc0290d49..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2985
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


From 3eb1e4e117100cb2bc37bfb9390e4835591f9896 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 09:28:17 +0200
Subject: [PATCH 08/12] Fixes #1241: Removed disposition-based combat
 conditions

The information for this code came from UESP, which in turn cites a (extremely vague) section from the TES-CS help text, so no surprise that it wasn't accurate.

The guard on the boat has a fight rating of 70, so with the old code it would attack on sight if the disposition is low enough. BTB-Character.esp includes something (not sure what) that drops his disposition to 35 when playing as a Khajiit, making him attack.

Testing in Vanilla it appears that disposition has no effect on combat engagement at all. Even with disposition 0 and fight 70 the NPCs don't attack.

Setting an NPCs fight rating to 70 or less still has a meaning, because the higher it is, the easier it becomes to raise the fight rating to 80 (by taunting, for example).
---
 apps/openmw/mwmechanics/actors.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 804ec7a41..96194d292 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -204,11 +204,6 @@ namespace MWMechanics
                     || (fight >= 95 && d <= 3000)
                     || (fight >= 90 && d <= 2000)
                     || (fight >= 80 && d <= 1000)
-                    || (fight >= 80 && disp <= 40)
-                    || (fight >= 70 && disp <= 35 && d <= 1000)
-                    || (fight >= 60 && disp <= 30 && d <= 1000)
-                    || (fight >= 50 && disp == 0)
-                    || (fight >= 40 && disp <= 10 && d <= 500)
                     )
                 {
                     bool LOS = MWBase::Environment::get().getWorld()->getLOS(ptr,player)

From e42855d522101adc45cbc733dbe8bb96c28b652b Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 27 Apr 2014 12:54:18 +0200
Subject: [PATCH 09/12] Minor fix for spell icon

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 34402977c..841f617b7 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -340,6 +340,8 @@ namespace MWMechanics
             MWWorld::ContainerStoreIterator enchantItem = inv.getSelectedEnchantItem();
             if (enchantItem != inv.end())
                 winMgr->setSelectedEnchantItem(*enchantItem);
+            else if (winMgr->getSelectedSpell() == "")
+                winMgr->unsetSelectedSpell();
         }
 
         if (mUpdatePlayer)

From 1da19585dc2f279417ad1660d3842bded75f112d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 28 Apr 2014 07:49:08 +0200
Subject: [PATCH 10/12] Remove some unneeded includes

---
 apps/openmw/mwrender/videoplayer.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/apps/openmw/mwrender/videoplayer.cpp b/apps/openmw/mwrender/videoplayer.cpp
index 80704ca7c..82400aac4 100644
--- a/apps/openmw/mwrender/videoplayer.cpp
+++ b/apps/openmw/mwrender/videoplayer.cpp
@@ -6,14 +6,9 @@
 #include <cstdio>
 #include <cmath>
 
-#include <OgreRoot.h>
 #include <OgreHardwarePixelBuffer.h>
-#include <OgreRenderWindow.h>
 #include <OgreTextureManager.h>
-#include <OgreTechnique.h>
-#include <OgreRectangle2D.h>
-#include <OgreMaterialManager.h>
-#include <OgreSceneNode.h>
+#include <OgreStringConverter.h>
 
 #include <boost/thread.hpp>
 
@@ -21,9 +16,6 @@
 #include "../mwbase/soundmanager.hpp"
 #include "../mwsound/sound_decoder.hpp"
 #include "../mwsound/sound.hpp"
-#include "../mwbase/inputmanager.hpp"
-
-#include "renderconst.hpp"
 
 #ifdef _WIN32
 #include <BaseTsd.h>

From b89463db091936aa5017cadaae99883efafbc375 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 28 Apr 2014 09:12:03 +0200
Subject: [PATCH 11/12] Fix #1207: Remember previous choice in class creation
 dialog

---
 apps/openmw/mwgui/charactercreation.cpp | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwgui/charactercreation.cpp b/apps/openmw/mwgui/charactercreation.cpp
index 5526bd26d..fa1bd28be 100644
--- a/apps/openmw/mwgui/charactercreation.cpp
+++ b/apps/openmw/mwgui/charactercreation.cpp
@@ -188,12 +188,13 @@ namespace MWGui
                 break;
 
             case GM_ClassCreate:
-                MWBase::Environment::get().getWindowManager()->removeDialog(mCreateClassDialog);
-                mCreateClassDialog = 0;
-                mCreateClassDialog = new CreateClassDialog();
+                if (!mCreateClassDialog)
+                {
+                    mCreateClassDialog = new CreateClassDialog();
+                    mCreateClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogDone);
+                    mCreateClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogBack);
+                }
                 mCreateClassDialog->setNextButtonShow(mCreationStage >= CSE_ClassChosen);
-                mCreateClassDialog->eventDone += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogDone);
-                mCreateClassDialog->eventBack += MyGUI::newDelegate(this, &CharacterCreation::onCreateClassDialogBack);
                 mCreateClassDialog->setVisible(true);
                 if (mCreationStage < CSE_RaceChosen)
                     mCreationStage = CSE_RaceChosen;
@@ -531,8 +532,8 @@ namespace MWGui
             mPlayerClass = klass;
             MWBase::Environment::get().getWindowManager()->setPlayerClass(klass);
 
-            MWBase::Environment::get().getWindowManager()->removeDialog(mCreateClassDialog);
-            mCreateClassDialog = 0;
+            // Do not delete dialog, so that choices are rembered in case we want to go back and adjust them later
+            mCreateClassDialog->setVisible(false);
         }
 
         updatePlayerHealth();
@@ -554,8 +555,8 @@ namespace MWGui
 
     void CharacterCreation::onCreateClassDialogBack()
     {
-        MWBase::Environment::get().getWindowManager()->removeDialog(mCreateClassDialog);
-        mCreateClassDialog = 0;
+        // Do not delete dialog, so that choices are rembered in case we want to go back and adjust them later
+        mCreateClassDialog->setVisible(false);
 
         MWBase::Environment::get().getWindowManager()->popGuiMode();
         MWBase::Environment::get().getWindowManager()->pushGuiMode(GM_Class);

From 1da99d9fc76cc52856d6ceda9a6f8a888f5e66f2 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 28 Apr 2014 10:26:24 +0200
Subject: [PATCH 12/12] Remove unused variable

---
 apps/openmw/mwmechanics/actors.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 96194d292..a0680c037 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -194,11 +194,6 @@ namespace MWMechanics
                     +(actorpos.pos[1] - playerpos.pos[1])*(actorpos.pos[1] - playerpos.pos[1])
                     +(actorpos.pos[2] - playerpos.pos[2])*(actorpos.pos[2] - playerpos.pos[2]));
                 float fight = ptr.getClass().getCreatureStats(ptr).getAiSetting(CreatureStats::AI_Fight).getModified();
-                float disp = 100; //creatures don't have disposition, so set it to 100 by default
-                if(ptr.getTypeName() == typeid(ESM::NPC).name())
-                {
-                    disp = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(ptr);
-                }
 
                 if(    (fight == 100 )
                     || (fight >= 95 && d <= 3000)