From 6eca5ac4bbab19dcf2a2a751431a655108718d45 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 26 Apr 2014 07:46:19 +0200
Subject: [PATCH 01/23] Fixes #1296: Streamlined cellChanged detection

---
 apps/openmw/engine.cpp | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 508b195e9..03361408c 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -59,9 +59,6 @@ void OMW::Engine::executeLocalScripts()
         MWScript::InterpreterContext interpreterContext (
             &script.second.getRefData().getLocals(), script.second);
         MWBase::Environment::get().getScriptManager()->run (script.first, interpreterContext);
-
-        if (MWBase::Environment::get().getWorld()->hasCellChanged())
-            break;
     }
 
     localScripts.setIgnore (MWWorld::Ptr());
@@ -101,15 +98,10 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
             // global scripts
             MWBase::Environment::get().getScriptManager()->getGlobalScripts().run();
 
-            bool changed = MWBase::Environment::get().getWorld()->hasCellChanged();
-
             // local scripts
-            executeLocalScripts(); // This does not handle the case where a global script causes a
-                                    // cell change, followed by a cell change in a local script during
-                                    // the same frame.
+            executeLocalScripts();
 
-            if (changed) // keep change flag for another frame, if cell changed happened in local script
-                MWBase::Environment::get().getWorld()->markCellAsUnchanged();
+            MWBase::Environment::get().getWorld()->markCellAsUnchanged();
 
             if (!paused)
                 MWBase::Environment::get().getWorld()->advanceTime(

From afe624bd07822ca9ee9fd6ba120c9036b4ffe743 Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sat, 26 Apr 2014 08:12:57 -0400
Subject: [PATCH 02/23] Cleaned up update in Actors.cpp

Removed unnecessary for loops
---
 apps/openmw/mwmechanics/actors.cpp | 35 +++++++++---------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index ca37b152c..267170214 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -852,39 +852,29 @@ namespace MWMechanics
                 // Note, the new hit object for this frame may be set by CharacterController::update -> Animation::runAnimation
                 // (below)
                 iter->first.getClass().getCreatureStats(iter->first).setLastHitObject(std::string());
-            }
 
-            // AI and magic effects update
-            for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
-            {
+                // AI and magic effects update
                 if (!iter->first.getClass().getCreatureStats(iter->first).isDead())
                 {
                     updateActor(iter->first, duration);
                     if(iter->first.getTypeName() == typeid(ESM::NPC).name())
                         updateNpc(iter->first, duration, paused);
                 }
-            }
 
-            // Looping magic VFX update
-            // Note: we need to do this before any of the animations are updated.
-            // Reaching the text keys may trigger Hit / Spellcast (and as such, particles),
-            // so updating VFX immediately after that would just remove the particle effects instantly.
-            // There needs to be a magic effect update in between.
-            for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+                // Looping magic VFX update
+                // Note: we need to do this before any of the animations are updated.
+                // Reaching the text keys may trigger Hit / Spellcast (and as such, particles),
+                // so updating VFX immediately after that would just remove the particle effects instantly.
+                // There needs to be a magic effect update in between.
                 iter->second->updateContinuousVfx();
 
-            // Animation/movement update
-            for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
-            {
+                // Animation/movement update
                 if (iter->first.getClass().getCreatureStats(iter->first).getMagicEffects().get(
                             ESM::MagicEffect::Paralyze).mMagnitude > 0)
                     iter->second->skipAnim();
                 iter->second->update(duration);
-            }
 
-            // Kill dead actors
-            for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();iter++)
-            {
+                // Kill dead actors
                 const MWWorld::Class &cls = MWWorld::Class::get(iter->first);
                 CreatureStats &stats = cls.getCreatureStats(iter->first);
 
@@ -912,13 +902,8 @@ namespace MWMechanics
                     continue;
                 }
 
-                // Make sure spell effects with CasterLinked flag are removed
-                // TODO: would be nice not to do this all the time...
-                for(PtrControllerMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
-                {
-                    MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
-                    spells.purge(iter->first.getRefData().getHandle());
-                }
+                MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
+                spells.purge(iter->first.getRefData().getHandle());
 
                 // FIXME: see http://bugs.openmw.org/issues/869
                 MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, false);

From 48b2c0073b1dceecb940eed8e54ff061833bc773 Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sat, 26 Apr 2014 08:29:28 -0400
Subject: [PATCH 03/23] fix, sorry for being sloppy..

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

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 267170214..a08cd9c33 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -845,7 +845,7 @@ namespace MWMechanics
     {
         if(!paused)
         {
-            // Reset data from previous frame
+            // Update actors from previous frame
             for (PtrControllerMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
                 // Reset last hit object, which is only valid for one frame
@@ -902,7 +902,7 @@ namespace MWMechanics
                     continue;
                 }
 
-                MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
+                MWMechanics::ActiveSpells& spells = iter->first.getClass().getCreatureStats(iter->first).getActiveSpells();
                 spells.purge(iter->first.getRefData().getHandle());
 
                 // FIXME: see http://bugs.openmw.org/issues/869

From f0c5d1a7e1eba636e3b0baa9ead6d00e70b059b3 Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sat, 26 Apr 2014 10:03:56 -0400
Subject: [PATCH 04/23] Revert "Checks the state of the passed sneak variable"

This reverts commit 4a4c08946c5b75701a5eb9b3e878c0727380909d.
---
 apps/openmw/mwworld/player.cpp | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 8588547d2..f4ca5ee27 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -134,25 +134,17 @@ namespace MWWorld
 
         ptr.getClass().getCreatureStats(ptr).setMovementFlag(MWMechanics::CreatureStats::Flag_Sneak, sneak);
 
-        if (sneak == true)
-        {
-            const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
+        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
-            // Find all the actors who might be able to see the player
-            std::vector<MWWorld::Ptr> neighbors;
-            MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
-                                        esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
-            for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
-            {
-                if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) )
-                { 
-                    MWBase::Environment::get().getWindowManager()->setSneakVisibility(false);
-                    break;
-                }
-            }
-            if (neighbors.size() == 0)
-                MWBase::Environment::get().getWindowManager()->setSneakVisibility(true);
-        }
+        // Find all the actors who might be able to see the player
+        std::vector<MWWorld::Ptr> neighbors;
+        MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
+                                    esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
+        for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
+            if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) ) 
+                MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
+        if (!neighbors.size())
+            MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
     }
 
     void Player::yaw(float yaw)

From b28dfa94cd5b92f47d9adef8ee06d7a1908cc7a1 Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sat, 26 Apr 2014 10:07:56 -0400
Subject: [PATCH 05/23] Revert 4a4c089..f0c5d1a

This rolls back to commit 4a4c08946c5b75701a5eb9b3e878c0727380909d.
---
 apps/openmw/mwmechanics/actors.cpp | 37 +++++++++++++++++++++---------
 apps/openmw/mwworld/player.cpp     | 28 ++++++++++++++--------
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index a08cd9c33..ca37b152c 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -845,36 +845,46 @@ namespace MWMechanics
     {
         if(!paused)
         {
-            // Update actors from previous frame
+            // Reset data from previous frame
             for (PtrControllerMap::iterator iter(mActors.begin()); iter != mActors.end(); ++iter)
             {
                 // Reset last hit object, which is only valid for one frame
                 // Note, the new hit object for this frame may be set by CharacterController::update -> Animation::runAnimation
                 // (below)
                 iter->first.getClass().getCreatureStats(iter->first).setLastHitObject(std::string());
+            }
 
-                // AI and magic effects update
+            // AI and magic effects update
+            for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+            {
                 if (!iter->first.getClass().getCreatureStats(iter->first).isDead())
                 {
                     updateActor(iter->first, duration);
                     if(iter->first.getTypeName() == typeid(ESM::NPC).name())
                         updateNpc(iter->first, duration, paused);
                 }
+            }
 
-                // Looping magic VFX update
-                // Note: we need to do this before any of the animations are updated.
-                // Reaching the text keys may trigger Hit / Spellcast (and as such, particles),
-                // so updating VFX immediately after that would just remove the particle effects instantly.
-                // There needs to be a magic effect update in between.
+            // Looping magic VFX update
+            // Note: we need to do this before any of the animations are updated.
+            // Reaching the text keys may trigger Hit / Spellcast (and as such, particles),
+            // so updating VFX immediately after that would just remove the particle effects instantly.
+            // There needs to be a magic effect update in between.
+            for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
                 iter->second->updateContinuousVfx();
 
-                // Animation/movement update
+            // Animation/movement update
+            for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();++iter)
+            {
                 if (iter->first.getClass().getCreatureStats(iter->first).getMagicEffects().get(
                             ESM::MagicEffect::Paralyze).mMagnitude > 0)
                     iter->second->skipAnim();
                 iter->second->update(duration);
+            }
 
-                // Kill dead actors
+            // Kill dead actors
+            for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();iter++)
+            {
                 const MWWorld::Class &cls = MWWorld::Class::get(iter->first);
                 CreatureStats &stats = cls.getCreatureStats(iter->first);
 
@@ -902,8 +912,13 @@ namespace MWMechanics
                     continue;
                 }
 
-                MWMechanics::ActiveSpells& spells = iter->first.getClass().getCreatureStats(iter->first).getActiveSpells();
-                spells.purge(iter->first.getRefData().getHandle());
+                // Make sure spell effects with CasterLinked flag are removed
+                // TODO: would be nice not to do this all the time...
+                for(PtrControllerMap::iterator iter2(mActors.begin());iter2 != mActors.end();++iter2)
+                {
+                    MWMechanics::ActiveSpells& spells = iter2->first.getClass().getCreatureStats(iter2->first).getActiveSpells();
+                    spells.purge(iter->first.getRefData().getHandle());
+                }
 
                 // FIXME: see http://bugs.openmw.org/issues/869
                 MWBase::Environment::get().getWorld()->enableActorCollision(iter->first, false);
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index f4ca5ee27..8588547d2 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -134,17 +134,25 @@ namespace MWWorld
 
         ptr.getClass().getCreatureStats(ptr).setMovementFlag(MWMechanics::CreatureStats::Flag_Sneak, sneak);
 
-        const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
+        if (sneak == true)
+        {
+            const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
 
-        // Find all the actors who might be able to see the player
-        std::vector<MWWorld::Ptr> neighbors;
-        MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
-                                    esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
-        for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
-            if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) ) 
-                MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
-        if (!neighbors.size())
-            MWBase::Environment::get().getWindowManager()->setSneakVisibility(sneak);
+            // Find all the actors who might be able to see the player
+            std::vector<MWWorld::Ptr> neighbors;
+            MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
+                                        esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
+            for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
+            {
+                if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) )
+                { 
+                    MWBase::Environment::get().getWindowManager()->setSneakVisibility(false);
+                    break;
+                }
+            }
+            if (neighbors.size() == 0)
+                MWBase::Environment::get().getWindowManager()->setSneakVisibility(true);
+        }
     }
 
     void Player::yaw(float yaw)

From ab33e78b6799c8875d262048651787ee83a8f044 Mon Sep 17 00:00:00 2001
From: graffy76 <monograff76@gmail.com>
Date: Sat, 26 Apr 2014 09:40:58 -0500
Subject: [PATCH 06/23] Added RangeView class files

---
 apps/opencs/CMakeLists.txt                |  1 +
 apps/opencs/view/settings/booleanview.hpp |  2 +-
 apps/opencs/view/settings/rangeview.cpp   | 91 +++++++++++++++++++++++
 apps/opencs/view/settings/rangeview.hpp   | 44 +++++++++++
 4 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 apps/opencs/view/settings/rangeview.cpp
 create mode 100644 apps/opencs/view/settings/rangeview.hpp

diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 8ab44243d..680c8f8b7 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -95,6 +95,7 @@ opencs_units (view/settings
     booleanview
     textview
     listview
+    rangeview
     resizeablestackedwidget
     )
 
diff --git a/apps/opencs/view/settings/booleanview.hpp b/apps/opencs/view/settings/booleanview.hpp
index 52f9e05f1..55ef0bb08 100644
--- a/apps/opencs/view/settings/booleanview.hpp
+++ b/apps/opencs/view/settings/booleanview.hpp
@@ -1,5 +1,5 @@
 #ifndef CSVSETTINGS_BOOLEANVIEW_HPP
-#define CSVSETTINGS_BOOELANVIEW_HPP
+#define CSVSETTINGS_BOOLEANVIEW_HPP
 
 #include <QWidget>
 #include <QAbstractButton>
diff --git a/apps/opencs/view/settings/rangeview.cpp b/apps/opencs/view/settings/rangeview.cpp
new file mode 100644
index 000000000..411e12775
--- /dev/null
+++ b/apps/opencs/view/settings/rangeview.cpp
@@ -0,0 +1,91 @@
+#include <QHBoxLayout>
+#include <QVBoxLayout>
+
+#include <QCheckBox>
+#include <QRadioButton>
+#include <QGroupBox>
+
+#include <QAbstractButton>
+
+#include "rangeview.hpp"
+#include "../../model/settings/setting.hpp"
+
+CSVSettings::RangeView::RangeView (CSMSettings::Setting *setting,
+                                       Page *parent)
+    : View (setting, parent)
+{
+    foreach (const QString &value, setting->declaredValues())
+    {
+        QAbstractButton *button = 0;
+
+        if (isMultiValue())
+            button = new QCheckBox (value, this);
+        else
+            button = new QRadioButton (value, this);
+
+        connect (button, SIGNAL (clicked (bool)),
+                this, SLOT (slotToggled (bool)));
+
+        button->setObjectName (value);
+
+        addWidget (button);
+
+        mButtons[value] = button;
+    }
+}
+
+void CSVSettings::RangeView::slotToggled (bool state)
+{
+    //test only for true to avoid multiple selection updates with radiobuttons
+    if (!isMultiValue() && !state)
+        return;
+
+    QStringList values;
+
+    foreach (QString key, mButtons.keys())
+    {
+        if (mButtons.value(key)->isChecked())
+            values.append (key);
+    }
+    setSelectedValues (values, false);
+
+    View::updateView();
+}
+
+void CSVSettings::RangeView::updateView (bool signalUpdate) const
+{
+
+    QStringList values = selectedValues();
+
+    foreach (const QString &buttonName, mButtons.keys())
+    {
+        QAbstractButton *button = mButtons[buttonName];
+
+        //if the value is not found in the list, the widget is checked false
+        bool buttonValue = values.contains(buttonName);
+
+        //skip if the butotn value will not change
+        if (button->isChecked() == buttonValue)
+            continue;
+
+        //disable autoexclusive if it's enabled and we're setting
+        //the button value to false
+        bool switchExclusive = (!buttonValue && button->autoExclusive());
+
+        if (switchExclusive)
+            button->setAutoExclusive (false);
+
+        button->setChecked (buttonValue);
+
+        if (switchExclusive)
+            button->setAutoExclusive(true);
+    }
+    View::updateView (signalUpdate);
+}
+
+CSVSettings::RangeView *CSVSettings::RangeViewFactory::createView
+                                        (CSMSettings::Setting *setting,
+                                         Page *parent)
+{
+    return new RangeView (setting, parent);
+}
diff --git a/apps/opencs/view/settings/rangeview.hpp b/apps/opencs/view/settings/rangeview.hpp
new file mode 100644
index 000000000..1df0c7bd6
--- /dev/null
+++ b/apps/opencs/view/settings/rangeview.hpp
@@ -0,0 +1,44 @@
+#ifndef CSVSETTINGS_RANGEVIEW_HPP
+#define CSVSETTINGS_RANGEVIEW_HPP
+
+#include <QWidget>
+#include <QAbstractButton>
+
+#include "view.hpp"
+#include "../../model/settings/support.hpp"
+
+class QStringListModel;
+
+namespace CSVSettings
+{
+    class RangeView : public View
+    {
+        Q_OBJECT
+
+        QMap <QString, QAbstractButton *> mButtons;
+
+    public:
+        explicit RangeView (CSMSettings::Setting *setting,
+                              Page *parent);
+
+    protected:
+        void updateView (bool signalUpdate = true) const;
+
+    private slots:
+        void slotToggled (bool state);
+    };
+
+    class RangeViewFactory : public QObject, public IViewFactory
+    {
+        Q_OBJECT
+
+    public:
+        explicit RangeViewFactory (QWidget *parent = 0)
+            : QObject (parent)
+        {}
+
+        RangeView *createView (CSMSettings::Setting *setting,
+                                 Page *parent);
+    };
+}
+#endif // CSVSETTINGS_RANGEVIEW_HPP

From c2b692e124f0eb3079499d393cfc2a86bfa134ec Mon Sep 17 00:00:00 2001
From: Thomas <tluppi@thomas-GE60.(none)>
Date: Sat, 26 Apr 2014 17:21:53 -0400
Subject: [PATCH 07/23] getActorsFollowing/Fighting no longer returns dead
 actors

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

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 804ec7a41..d51b02a15 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1029,7 +1029,7 @@ namespace MWMechanics
             const MWWorld::Class &cls = MWWorld::Class::get(iter->first);
             CreatureStats &stats = cls.getCreatureStats(iter->first);
 
-            if(stats.getAiSequence().getTypeId() == AiPackage::TypeIdFollow)
+            if(stats.getAiSequence().getTypeId() == AiPackage::TypeIdFollow && !stats.isDead())
             {
                 MWMechanics::AiFollow* package = static_cast<MWMechanics::AiFollow*>(stats.getAiSequence().getActivePackage());
                 if(package->getFollowedActor() == actor.getCellRef().mRefID)
@@ -1051,7 +1051,7 @@ namespace MWMechanics
             const MWWorld::Class &cls = MWWorld::Class::get(*iter);
             CreatureStats &stats = cls.getCreatureStats(*iter);
 
-            if(stats.getAiSequence().getTypeId() == AiPackage::TypeIdCombat)
+            if(stats.getAiSequence().getTypeId() == AiPackage::TypeIdCombat && !stats.isDead())
             {
                 MWMechanics::AiCombat* package = static_cast<MWMechanics::AiCombat*>(stats.getAiSequence().getActivePackage());
                 if(package->getTargetId() == actor.getCellRef().mRefID)

From 1fb2c8d87bf505ccf003415e2fafcefb218e4688 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Sat, 26 Apr 2014 19:47:47 +1000
Subject: [PATCH 08/23] NPC turning is less hacky but still not perfect.  NPC's
 should walk away after a period of non-action by the player (vanilla
 behaviour) - not yet implemented.

---
 apps/openmw/mwmechanics/aiwander.cpp | 41 +++++++++++++++++-----------
 apps/openmw/mwmechanics/aiwander.hpp |  1 +
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index ad94be0eb..2d1fbdd78 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -1,6 +1,7 @@
 #include "aiwander.hpp"
 
 #include <OgreVector3.h>
+#include <OgreSceneNode.h>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -211,7 +212,7 @@ namespace MWMechanics
             // Reduce the turning animation glitch by using a *HUGE* value of
             // epsilon...  TODO: a proper fix might be in either the physics or the
             // animation subsystem
-            if (zTurn(actor, Ogre::Degree(mTargetAngle), Ogre::Degree(12)))
+            if (zTurn(actor, Ogre::Degree(mTargetAngle), Ogre::Degree(5)))
                 mRotate = false;
         }
 
@@ -333,18 +334,7 @@ namespace MWMechanics
         if(mChooseAction)
         {
             mPlayedIdle = 0;
-            unsigned short idleRoll = 0;
-
-            for(unsigned int counter = 0; counter < mIdle.size(); counter++)
-            {
-                unsigned short idleChance = mIdleChanceMultiplier * mIdle[counter];
-                unsigned short randSelect = (int)(rand() / ((double)RAND_MAX + 1) * int(100 / mIdleChanceMultiplier));
-                if(randSelect < idleChance && randSelect > idleRoll)
-                {
-                    mPlayedIdle = counter+2;
-                    idleRoll = randSelect;
-                }
-            }
+            getRandomIdle(); // NOTE: sets mPlayedIdle with a random selection
 
             if(!mPlayedIdle && mDistance)
             {
@@ -395,6 +385,8 @@ namespace MWMechanics
                     mMoveNow = false;
                     mWalking = false;
                     mObstacleCheck.clear();
+                    mIdleNow = true;
+                    getRandomIdle();
                 }
 
                 if(!mRotate)
@@ -402,11 +394,11 @@ namespace MWMechanics
                     Ogre::Vector3 dir = playerPos - actorPos;
                     float length = dir.length();
 
-                    // FIXME: horrible hack
                     float faceAngle = Ogre::Radian(Ogre::Math::ACos(dir.y / length) *
                             ((Ogre::Math::ASin(dir.x / length).valueRadians()>0)?1.0:-1.0)).valueDegrees();
+                    float actorAngle = actor.getRefData().getBaseNode()->getOrientation().getRoll().valueDegrees();
                     // an attempt at reducing the turning animation glitch
-                    if(abs(faceAngle) > 10)
+                    if(abs(abs(faceAngle) - abs(actorAngle)) >= 5) // TODO: is there a better way?
                     {
                         mTargetAngle = faceAngle;
                         mRotate = true;
@@ -432,7 +424,8 @@ namespace MWMechanics
             }
 
             // Check if idle animation finished
-            if(!checkIdle(actor, mPlayedIdle))
+            // FIXME: don't stay forever
+            if(!checkIdle(actor, mPlayedIdle) && playerDistSqr > helloDistance*helloDistance)
             {
                 mPlayedIdle = 0;
                 mIdleNow = false;
@@ -586,5 +579,21 @@ namespace MWMechanics
         else
             return false;
     }
+
+    void AiWander::getRandomIdle()
+    {
+        unsigned short idleRoll = 0;
+
+        for(unsigned int counter = 0; counter < mIdle.size(); counter++)
+        {
+            unsigned short idleChance = mIdleChanceMultiplier * mIdle[counter];
+            unsigned short randSelect = (int)(rand() / ((double)RAND_MAX + 1) * int(100 / mIdleChanceMultiplier));
+            if(randSelect < idleChance && randSelect > idleRoll)
+            {
+                mPlayedIdle = counter+2;
+                idleRoll = randSelect;
+            }
+        }
+    }
 }
 
diff --git a/apps/openmw/mwmechanics/aiwander.hpp b/apps/openmw/mwmechanics/aiwander.hpp
index fe14abeb6..35ecc83e0 100644
--- a/apps/openmw/mwmechanics/aiwander.hpp
+++ b/apps/openmw/mwmechanics/aiwander.hpp
@@ -26,6 +26,7 @@ namespace MWMechanics
             void stopWalking(const MWWorld::Ptr& actor);
             void playIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
             bool checkIdle(const MWWorld::Ptr& actor, unsigned short idleSelect);
+            void getRandomIdle();
 
             int mDistance; // how far the actor can wander from the spawn point
             int mDuration;

From 0d711e51b00463308d455510d8668322fec81099 Mon Sep 17 00:00:00 2001
From: graffy76 <monograff76@gmail.com>
Date: Sat, 26 Apr 2014 21:32:36 -0500
Subject: [PATCH 09/23] Converted SettingType enums to indicate widget type.

---
 apps/opencs/model/settings/setting.cpp      | 17 ++++++------
 apps/opencs/model/settings/support.hpp      | 29 +++++++++++++++------
 apps/opencs/model/settings/usersettings.cpp | 18 ++++++-------
 apps/opencs/view/settings/page.cpp          |  2 ++
 apps/opencs/view/settings/rangeview.cpp     |  4 +++
 apps/opencs/view/settings/settingwindow.cpp | 12 +++++----
 6 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/apps/opencs/model/settings/setting.cpp b/apps/opencs/model/settings/setting.cpp
index 6c7e78087..ca682b454 100644
--- a/apps/opencs/model/settings/setting.cpp
+++ b/apps/opencs/model/settings/setting.cpp
@@ -12,15 +12,14 @@ CSMSettings::Setting::Setting(SettingType typ, const QString &settingName,
 {
     buildDefaultSetting();
 
-    int vType = static_cast <int> (typ);
+    int settingType = static_cast <int> (typ);
 
-    if ((vType % 2) == 0)
-        setProperty (Property_IsMultiValue,
-                                QVariant(true).toString());
-    else
-        vType--;
+    //even-numbered setting types are multi-valued
+    if ((settingType % 2) == 0)
+        setProperty (Property_IsMultiValue, QVariant(true).toString());
 
-    setProperty (Property_ViewType, QVariant (vType / 2).toString());
+    //view type is related to setting type by an order of magnitude
+    setProperty (Property_ViewType, QVariant (settingType / 10).toString());
     setProperty (Property_Page, pageName);
     setProperty (Property_Name, settingName);
     setProperty (Property_DeclaredValues, values);
@@ -267,9 +266,9 @@ void CSMSettings::Setting::setProperty (SettingProperty prop,
 
 QDataStream &operator <<(QDataStream &stream, const CSMSettings::Setting& setting)
 {
-    stream << setting.properties();
+ //   stream << setting.properties();
 
-    stream << setting.proxies();
+ //   stream << setting.proxies();
     return stream;
 }
 
diff --git a/apps/opencs/model/settings/support.hpp b/apps/opencs/model/settings/support.hpp
index abc86a0cb..ce808587f 100644
--- a/apps/opencs/model/settings/support.hpp
+++ b/apps/opencs/model/settings/support.hpp
@@ -47,14 +47,27 @@ namespace CSMSettings
 
     enum SettingType
     {
-        Type_MultiBool = 0,
-        Type_SingleBool = 1,
-        Type_MultiList = 2,
-        Type_SingleList  = 3,
-        Type_MultiRange = 4,
-        Type_SingleRange = 5,
-        Type_MultiText = 6,
-        Type_SingleText = 7
+        /*
+        * 0 - 9 - Boolean widgets
+        * 10-19 - List widgets
+        * 21-29 - Range widgets
+        * 31-39 - Text widgets
+        *
+        * Each range corresponds to a View_Type enum by a factor of 10.
+        *
+        * Even-numbered values are single-value widgets
+        * Odd-numbered values are multi-valued widgets
+        */
+
+        Type_CheckBox = 0,
+        Type_RadioButton = 1,
+        Type_ListView = 10,
+        Type_ComboBox = 11,
+        Type_SpinBox = 21,
+        Type_Slider = 23,
+        Type_Dial = 24,
+        Type_TextArea = 30,
+        Type_LineEdit = 31
     };
 
     enum MergeMethod
diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index 808fbfc70..2f8e8098d 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -47,8 +47,8 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
 {
     QString section = "Window Size";
     {
-        Setting *width = createSetting (Type_SingleText, section, "Width");
-        Setting *height = createSetting (Type_SingleText, section, "Height");
+        Setting *width = createSetting (Type_LineEdit, section, "Width");
+        Setting *height = createSetting (Type_LineEdit, section, "Height");
 
         width->setWidgetWidth (5);
         height->setWidgetWidth (5);
@@ -65,7 +65,7 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         /*
          *Create the proxy setting for predefined values
          */
-        Setting *preDefined = createSetting (Type_SingleList, section,
+        Setting *preDefined = createSetting (Type_ComboBox, section,
                                              "Pre-Defined",
                                             QStringList()
                                                 << "640 x 480"
@@ -94,11 +94,11 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         QStringList values = QStringList()
                             << defaultValue << "Icon Only" << "Text Only";
 
-        Setting *rsd = createSetting (Type_SingleBool,
+        Setting *rsd = createSetting (Type_RadioButton,
                                       section, "Record Status Display",
                                       values);
 
-        Setting *ritd = createSetting (Type_SingleBool,
+        Setting *ritd = createSetting (Type_RadioButton,
                                       section, "Referenceable ID Type Display",
                                       values);
 
@@ -110,24 +110,24 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
     {
         //create three setting objects, specifying the basic widget type,
         //the setting view name, the page name, and the default value
-        Setting *masterBoolean = createSetting (Type_SingleBool, section,
+        Setting *masterBoolean = createSetting (Type_RadioButton, section,
                                         "Master Proxy",
                                         QStringList()
                                             << "Profile One" << "Profile Two"
                                             << "Profile Three" << "Profile Four"
                                 );
 
-        Setting *slaveBoolean = createSetting (Type_MultiBool, section,
+        Setting *slaveBoolean = createSetting (Type_CheckBox, section,
                                         "Proxy Checkboxes",
                                         QStringList() << "One" << "Two"
                                              << "Three" << "Four" << "Five"
                                 );
 
-        Setting *slaveSingleText = createSetting (Type_SingleText, section,
+        Setting *slaveSingleText = createSetting (Type_LineEdit, section,
                                                   "Proxy TextBox 1"
                                                 );
 
-        Setting *slaveMultiText = createSetting (Type_SingleText, section,
+        Setting *slaveMultiText = createSetting (Type_LineEdit, section,
                                                  "ProxyTextBox 2"
                                                  );
 
diff --git a/apps/opencs/view/settings/page.cpp b/apps/opencs/view/settings/page.cpp
index a5711c8f8..e67445873 100644
--- a/apps/opencs/view/settings/page.cpp
+++ b/apps/opencs/view/settings/page.cpp
@@ -3,6 +3,7 @@
 #include "booleanview.hpp"
 #include "textview.hpp"
 #include "listview.hpp"
+#include "rangeview.hpp"
 
 #include "../../model/settings/usersettings.hpp"
 #include "../../model/settings/connector.hpp"
@@ -85,4 +86,5 @@ void CSVSettings::Page::buildFactories()
     mViewFactories[ViewType_Boolean] = new BooleanViewFactory (this);
     mViewFactories[ViewType_Text] = new TextViewFactory (this);
     mViewFactories[ViewType_List] = new ListViewFactory (this);
+    mViewFactories[ViewType_Range] = new RangeViewFactory (this);
 }
diff --git a/apps/opencs/view/settings/rangeview.cpp b/apps/opencs/view/settings/rangeview.cpp
index 411e12775..12b71d28f 100644
--- a/apps/opencs/view/settings/rangeview.cpp
+++ b/apps/opencs/view/settings/rangeview.cpp
@@ -10,6 +10,9 @@
 #include "rangeview.hpp"
 #include "../../model/settings/setting.hpp"
 
+
+#include <QDebug>
+
 CSVSettings::RangeView::RangeView (CSMSettings::Setting *setting,
                                        Page *parent)
     : View (setting, parent)
@@ -87,5 +90,6 @@ CSVSettings::RangeView *CSVSettings::RangeViewFactory::createView
                                         (CSMSettings::Setting *setting,
                                          Page *parent)
 {
+    qDebug() << "adding a new range view";
     return new RangeView (setting, parent);
 }
diff --git a/apps/opencs/view/settings/settingwindow.cpp b/apps/opencs/view/settings/settingwindow.cpp
index 9283bbf51..8eccee646 100644
--- a/apps/opencs/view/settings/settingwindow.cpp
+++ b/apps/opencs/view/settings/settingwindow.cpp
@@ -14,16 +14,18 @@ CSVSettings::SettingWindow::SettingWindow(QWidget *parent)
 
 void CSVSettings::SettingWindow::createPages()
 {
+    qDebug () << "getting page map";
     CSMSettings::SettingPageMap pageMap = mModel->settingPageMap();
 
     QList <CSMSettings::Setting *> connectedSettings;
-
+    qDebug () << "iterating map";
     foreach (const QString &pageName, pageMap.keys())
-    {
+    {        
+        qDebug() << "iterating page: " << pageName;
         QList <CSMSettings::Setting *> pageSettings = pageMap.value (pageName);
-
+        qDebug () << "appending page: " << pageName << "; settings =  " << pageSettings.size();
         mPages.append (new Page (pageName, pageSettings, this));
-
+        qDebug() << "iterating page " << pageName << " settings";
         for (int i = 0; i < pageSettings.size(); i++)
         {
             CSMSettings::Setting *setting = pageSettings.at(i);
@@ -32,7 +34,7 @@ void CSVSettings::SettingWindow::createPages()
                 connectedSettings.append (setting);
         }
     }
-
+    qDebug() << "making connections";
     if (!connectedSettings.isEmpty())
         createConnections(connectedSettings);
 }

From 985af15a12f2645c1fe47f25c67e460d2f4d39da Mon Sep 17 00:00:00 2001
From: graffy76 <monograff76@gmail.com>
Date: Sat, 26 Apr 2014 21:43:42 -0500
Subject: [PATCH 10/23] removed qdebug references

---
 apps/opencs/view/settings/rangeview.cpp     |  1 -
 apps/opencs/view/settings/settingwindow.cpp | 10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/opencs/view/settings/rangeview.cpp b/apps/opencs/view/settings/rangeview.cpp
index 12b71d28f..2bb5863bc 100644
--- a/apps/opencs/view/settings/rangeview.cpp
+++ b/apps/opencs/view/settings/rangeview.cpp
@@ -90,6 +90,5 @@ CSVSettings::RangeView *CSVSettings::RangeViewFactory::createView
                                         (CSMSettings::Setting *setting,
                                          Page *parent)
 {
-    qDebug() << "adding a new range view";
     return new RangeView (setting, parent);
 }
diff --git a/apps/opencs/view/settings/settingwindow.cpp b/apps/opencs/view/settings/settingwindow.cpp
index 8eccee646..7bd0b228e 100644
--- a/apps/opencs/view/settings/settingwindow.cpp
+++ b/apps/opencs/view/settings/settingwindow.cpp
@@ -14,18 +14,16 @@ CSVSettings::SettingWindow::SettingWindow(QWidget *parent)
 
 void CSVSettings::SettingWindow::createPages()
 {
-    qDebug () << "getting page map";
     CSMSettings::SettingPageMap pageMap = mModel->settingPageMap();
 
     QList <CSMSettings::Setting *> connectedSettings;
-    qDebug () << "iterating map";
+
     foreach (const QString &pageName, pageMap.keys())
     {        
-        qDebug() << "iterating page: " << pageName;
         QList <CSMSettings::Setting *> pageSettings = pageMap.value (pageName);
-        qDebug () << "appending page: " << pageName << "; settings =  " << pageSettings.size();
+
         mPages.append (new Page (pageName, pageSettings, this));
-        qDebug() << "iterating page " << pageName << " settings";
+
         for (int i = 0; i < pageSettings.size(); i++)
         {
             CSMSettings::Setting *setting = pageSettings.at(i);
@@ -34,7 +32,7 @@ void CSVSettings::SettingWindow::createPages()
                 connectedSettings.append (setting);
         }
     }
-    qDebug() << "making connections";
+
     if (!connectedSettings.isEmpty())
         createConnections(connectedSettings);
 }

From ce106d3becb8b1b7739f21011578d86a76f61c7b Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sun, 27 Apr 2014 09:34:33 -0400
Subject: [PATCH 11/23] Revert "NPCs detect crime exclusively"

This reverts commit 54d9615d85ae856ad4fdd2c130ac9cb0cd847c72.

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

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 2b1fdd365..26c629fb8 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -843,7 +843,10 @@ namespace MWMechanics
         // Find an actor who witnessed the crime
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
+<<<<<<< HEAD
+=======
             if (*it == ptr) continue; // not the player
+>>>>>>> parent of 54d9615... NPCs detect crime exclusively
 
             // Was the crime seen?
             if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||

From b9bd4bc1265a4f4c531b1456f9a4fcf21076cd55 Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sun, 27 Apr 2014 09:34:59 -0400
Subject: [PATCH 12/23] broken

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

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 26c629fb8..88d07cfa6 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -844,6 +844,8 @@ namespace MWMechanics
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
 <<<<<<< HEAD
+            if (   *it == ptr 
+                && it->getClass().isNpc()) continue; // not the player and is an NPC
 =======
             if (*it == ptr) continue; // not the player
 >>>>>>> parent of 54d9615... NPCs detect crime exclusively
@@ -862,7 +864,8 @@ namespace MWMechanics
                     // Tell everyone, including yourself
                     for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1)
                     {
-                        if (*it1 == ptr) continue; // not the player
+                        if (   *it == ptr 
+                            && it->getClass().isNpc()) continue; // not the player and is an NPC
 
                         // TODO: Add more messages
                         if (type == OT_Theft)

From 0409e18a0e7a903a00bc4c4b0951ee7532ec0317 Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sun, 27 Apr 2014 09:35:49 -0400
Subject: [PATCH 13/23] revert

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 88d07cfa6..2b1fdd365 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -843,12 +843,7 @@ namespace MWMechanics
         // Find an actor who witnessed the crime
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
-<<<<<<< HEAD
-            if (   *it == ptr 
-                && it->getClass().isNpc()) continue; // not the player and is an NPC
-=======
             if (*it == ptr) continue; // not the player
->>>>>>> parent of 54d9615... NPCs detect crime exclusively
 
             // Was the crime seen?
             if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||
@@ -864,8 +859,7 @@ namespace MWMechanics
                     // Tell everyone, including yourself
                     for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1)
                     {
-                        if (   *it == ptr 
-                            && it->getClass().isNpc()) continue; // not the player and is an NPC
+                        if (*it1 == ptr) continue; // not the player
 
                         // TODO: Add more messages
                         if (type == OT_Theft)

From 7599b26d309bba10a22adab0abd051674a31eb5a Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sun, 27 Apr 2014 09:37:43 -0400
Subject: [PATCH 14/23] Fixed: creatures won't witness crimes

and potential crash.
---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 2b1fdd365..03beed5a5 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -843,7 +843,8 @@ namespace MWMechanics
         // Find an actor who witnessed the crime
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
-            if (*it == ptr) continue; // not the player
+            if (   *it == ptr 
+                && it->getClass().isNpc()) continue; // not the player and is an NPC
 
             // Was the crime seen?
             if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||
@@ -859,7 +860,8 @@ namespace MWMechanics
                     // Tell everyone, including yourself
                     for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1)
                     {
-                        if (*it1 == ptr) continue; // not the player
+                        if (   *it == ptr 
+                            && it->getClass().isNpc()) continue; // not the player and is an NPC
 
                         // TODO: Add more messages
                         if (type == OT_Theft)

From 52bb7c3f69914084eacd1affa8470017286a4b1d Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sun, 27 Apr 2014 09:55:38 -0400
Subject: [PATCH 15/23] fixed logic. !

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

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 03beed5a5..8b8788741 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -844,7 +844,7 @@ namespace MWMechanics
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
             if (   *it == ptr 
-                && it->getClass().isNpc()) continue; // not the player and is an NPC
+                && !it->getClass().isNpc()) continue; // not the player and is an NPC
 
             // Was the crime seen?
             if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||
@@ -861,7 +861,7 @@ namespace MWMechanics
                     for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1)
                     {
                         if (   *it == ptr 
-                            && it->getClass().isNpc()) continue; // not the player and is an NPC
+                            && !it->getClass().isNpc()) continue; // not the player and is an NPC
 
                         // TODO: Add more messages
                         if (type == OT_Theft)

From edbc319c424d6fd29b00338608f6e52fc2f7b644 Mon Sep 17 00:00:00 2001
From: Jeffrey Haines <jeffhaines@me.com>
Date: Sun, 27 Apr 2014 10:05:34 -0400
Subject: [PATCH 16/23] fixed logic. ||

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

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 8b8788741..eca0c2289 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -844,7 +844,7 @@ namespace MWMechanics
         for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
         {
             if (   *it == ptr 
-                && !it->getClass().isNpc()) continue; // not the player and is an NPC
+                || !it->getClass().isNpc()) continue; // not the player and is an NPC
 
             // Was the crime seen?
             if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||
@@ -861,7 +861,7 @@ namespace MWMechanics
                     for (std::vector<MWWorld::Ptr>::iterator it1 = neighbors.begin(); it1 != neighbors.end(); ++it1)
                     {
                         if (   *it == ptr 
-                            && !it->getClass().isNpc()) continue; // not the player and is an NPC
+                            || !it->getClass().isNpc()) continue; // not the player and is an NPC
 
                         // TODO: Add more messages
                         if (type == OT_Theft)

From 1b8c975d5ba62a501ff160a69ef1af7051acf816 Mon Sep 17 00:00:00 2001
From: Thoronador <thoronador@users.sourceforge.net>
Date: Sun, 27 Apr 2014 19:03:33 +0200
Subject: [PATCH 17/23] minor performance improvements in apps/openmw

Checking for emptiness using size() might be inefficient, because
it can take linear time, while empty() is guaranteed to take only
constant time.

For non-primitive types, postfix ++ operators are inefficient
compared to prefix ++ operators, because post-increment usually
involves keeping a copy of the previous value around.
---
 apps/openmw/mwgui/tradewindow.cpp        | 12 ++++++------
 apps/openmw/mwmechanics/activespells.cpp |  4 ++--
 apps/openmw/mwmechanics/aisequence.cpp   |  8 ++++----
 apps/openmw/mwmechanics/pathgrid.cpp     |  2 +-
 apps/openmw/mwmechanics/spellcasting.cpp |  4 ++--
 apps/openmw/mwmechanics/spells.cpp       |  8 ++++----
 apps/openmw/mwrender/animation.cpp       | 24 ++++++++++++------------
 apps/openmw/mwrender/debugging.cpp       |  2 +-
 apps/openmw/mwrender/objects.cpp         |  8 ++++----
 apps/openmw/mwsound/soundmanagerimp.cpp  |  2 +-
 apps/openmw/mwworld/actionteleport.cpp   |  2 +-
 apps/openmw/mwworld/cellstore.cpp        |  1 -
 apps/openmw/mwworld/physicssystem.cpp    |  4 ++--
 apps/openmw/mwworld/player.cpp           |  6 +++---
 14 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index 3e15bcd78..9cabab3e8 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -78,13 +78,13 @@ namespace MWGui
     }
 
     void TradeWindow::startTrade(const MWWorld::Ptr& actor)
-    {        
+    {
         mPtr = actor;
 
         mCurrentBalance = 0;
         mCurrentMerchantOffer = 0;
 
-        checkTradeTime(); 
+        checkTradeTime();
 
         std::vector<MWWorld::Ptr> itemSources;
         MWBase::Environment::get().getWorld()->getContainersOwnedBy(actor, itemSources);
@@ -245,7 +245,7 @@ namespace MWGui
         // were there any items traded at all?
         std::vector<ItemStack> playerBought = playerItemModel->getItemsBorrowedToUs();
         std::vector<ItemStack> merchantBought = mTradeModel->getItemsBorrowedToUs();
-        if (!playerBought.size() && !merchantBought.size())
+        if (playerBought.empty() && merchantBought.empty())
         {
             // user notification
             MWBase::Environment::get().getWindowManager()->
@@ -476,7 +476,7 @@ namespace MWGui
     }
 
     // Relates to NPC gold reset delay
-    void TradeWindow::checkTradeTime() 
+    void TradeWindow::checkTradeTime()
     {
         MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
         double delay = boost::lexical_cast<double>(MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fBarterGoldResetDelay")->getInt());
@@ -488,14 +488,14 @@ namespace MWGui
         }
     }
 
-    void TradeWindow::updateTradeTime() 
+    void TradeWindow::updateTradeTime()
     {
         MWWorld::ContainerStore store = mPtr.getClass().getContainerStore(mPtr);
         MWMechanics::CreatureStats &sellerStats = mPtr.getClass().getCreatureStats(mPtr);
         double delay = boost::lexical_cast<double>(MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fBarterGoldResetDelay")->getInt());
 
         // If trade timestamp is within reset delay don't set
-        if ( ! (MWBase::Environment::get().getWorld()->getTimeStamp() >= sellerStats.getTradeTime() && 
+        if ( ! (MWBase::Environment::get().getWorld()->getTimeStamp() >= sellerStats.getTradeTime() &&
                 MWBase::Environment::get().getWorld()->getTimeStamp() < sellerStats.getTradeTime() + delay) )
         {
             sellerStats.setTradeTime(MWBase::Environment::get().getWorld()->getTimeStamp());
diff --git a/apps/openmw/mwmechanics/activespells.cpp b/apps/openmw/mwmechanics/activespells.cpp
index 0c5bd9afa..86db207a4 100644
--- a/apps/openmw/mwmechanics/activespells.cpp
+++ b/apps/openmw/mwmechanics/activespells.cpp
@@ -206,7 +206,7 @@ namespace MWMechanics
                 if (effectIt->mKey.mId == effectId)
                     effectIt = it->second.mEffects.erase(effectIt);
                 else
-                    effectIt++;
+                    ++effectIt;
             }
         }
         mSpellsChanged = true;
@@ -224,7 +224,7 @@ namespace MWMechanics
                         && it->second.mCasterHandle == actorHandle)
                     effectIt = it->second.mEffects.erase(effectIt);
                 else
-                    effectIt++;
+                    ++effectIt;
             }
         }
         mSpellsChanged = true;
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index c67367a6c..294c9b6a1 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -38,7 +38,7 @@ MWMechanics::AiSequence& MWMechanics::AiSequence::operator= (const AiSequence& s
         copy (sequence);
         mDone = sequence.mDone;
     }
-    
+
     return *this;
 }
 
@@ -51,7 +51,7 @@ int MWMechanics::AiSequence::getTypeId() const
 {
     if (mPackages.empty())
         return -1;
-        
+
     return mPackages.front()->getTypeId();
 }
 
@@ -102,7 +102,7 @@ void MWMechanics::AiSequence::execute (const MWWorld::Ptr& actor,float duration)
             }
             else
             {
-                mDone = false;    
+                mDone = false;
             }
         }
     }
@@ -118,7 +118,7 @@ void MWMechanics::AiSequence::clear()
 
 void MWMechanics::AiSequence::stack (const AiPackage& package)
 {
-    for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end(); it++)
+    for(std::list<AiPackage *>::iterator it = mPackages.begin(); it != mPackages.end(); ++it)
     {
         if(mPackages.front()->getPriority() <= package.getPriority())
         {
diff --git a/apps/openmw/mwmechanics/pathgrid.cpp b/apps/openmw/mwmechanics/pathgrid.cpp
index cb9f051e3..82d815d68 100644
--- a/apps/openmw/mwmechanics/pathgrid.cpp
+++ b/apps/openmw/mwmechanics/pathgrid.cpp
@@ -296,7 +296,7 @@ namespace MWMechanics
                             // add this edge to openset, lowest cost goes to the front
                             // TODO: if this causes performance problems a hash table may help
                             std::list<int>::iterator it = openset.begin();
-                            for(it = openset.begin(); it!= openset.end(); it++)
+                            for(it = openset.begin(); it!= openset.end(); ++it)
                             {
                                 if(fScore[*it] > fScore[dest])
                                     break;
diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 21aee5b98..e6342e661 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -401,10 +401,10 @@ namespace MWMechanics
         if (!exploded)
             MWBase::Environment::get().getWorld()->explodeSpell(mHitPosition, mTarget, effects, caster, mId, mSourceName);
 
-        if (reflectedEffects.mList.size())
+        if (!reflectedEffects.mList.empty())
             inflict(caster, target, reflectedEffects, range, true);
 
-        if (appliedLastingEffects.size())
+        if (!appliedLastingEffects.empty())
             target.getClass().getCreatureStats(target).getActiveSpells().addSpell(mId, mStack, appliedLastingEffects,
                                                                                   mSourceName, caster.getRefData().getHandle());
 
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index 21781c530..c2bf794f1 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -129,7 +129,7 @@ namespace MWMechanics
             if (spell->mData.mType == ESM::Spell::ST_Disease)
                 mSpells.erase(iter++);
             else
-                iter++;
+                ++iter;
         }
     }
 
@@ -143,7 +143,7 @@ namespace MWMechanics
             if (spell->mData.mType == ESM::Spell::ST_Blight)
                 mSpells.erase(iter++);
             else
-                iter++;
+                ++iter;
         }
     }
 
@@ -157,7 +157,7 @@ namespace MWMechanics
             if (Misc::StringUtils::ciEqual(spell->mId, "corprus"))
                 mSpells.erase(iter++);
             else
-                iter++;
+                ++iter;
         }
     }
 
@@ -171,7 +171,7 @@ namespace MWMechanics
             if (spell->mData.mType == ESM::Spell::ST_Curse)
                 mSpells.erase(iter++);
             else
-                iter++;
+                ++iter;
         }
     }
 
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index e62fee6e2..3b8b91b0e 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -411,7 +411,7 @@ Ogre::Node *Animation::getNode(const std::string &name)
 NifOgre::TextKeyMap::const_iterator Animation::findGroupStart(const NifOgre::TextKeyMap &keys, const std::string &groupname)
 {
     NifOgre::TextKeyMap::const_iterator iter(keys.begin());
-    for(;iter != keys.end();iter++)
+    for(;iter != keys.end();++iter)
     {
         if(iter->second.compare(0, groupname.size(), groupname) == 0 &&
            iter->second.compare(groupname.size(), 2, ": ") == 0)
@@ -424,7 +424,7 @@ NifOgre::TextKeyMap::const_iterator Animation::findGroupStart(const NifOgre::Tex
 bool Animation::hasAnimation(const std::string &anim)
 {
     AnimSourceList::const_iterator iter(mAnimSources.begin());
-    for(;iter != mAnimSources.end();iter++)
+    for(;iter != mAnimSources.end();++iter)
     {
         const NifOgre::TextKeyMap &keys = (*iter)->mTextKeys;
         if(findGroupStart(keys, anim) != keys.end())
@@ -465,7 +465,7 @@ float Animation::calcAnimVelocity(const NifOgre::TextKeyMap &keys, NifOgre::Node
             stoptime = keyiter->first;
             break;
         }
-        keyiter++;
+        ++keyiter;
     }
 
     if(stoptime > starttime)
@@ -585,13 +585,13 @@ bool Animation::reset(AnimState &state, const NifOgre::TextKeyMap &keys, const s
     std::string starttag = groupname+": "+start;
     NifOgre::TextKeyMap::const_iterator startkey(groupstart);
     while(startkey != keys.end() && startkey->second != starttag)
-        startkey++;
+        ++startkey;
     if(startkey == keys.end() && start == "loop start")
     {
         starttag = groupname+": start";
         startkey = groupstart;
         while(startkey != keys.end() && startkey->second != starttag)
-            startkey++;
+            ++startkey;
     }
     if(startkey == keys.end())
         return false;
@@ -603,7 +603,7 @@ bool Animation::reset(AnimState &state, const NifOgre::TextKeyMap &keys, const s
           // The Scrib's idle3 animation has "Idle3: Stop." instead of "Idle3: Stop".
           // Why, just why? :(
           && (stopkey->second.size() < stoptag.size() || stopkey->second.substr(0,stoptag.size()) != stoptag))
-        stopkey++;
+        ++stopkey;
     if(stopkey == keys.end())
         return false;
 
@@ -627,7 +627,7 @@ bool Animation::reset(AnimState &state, const NifOgre::TextKeyMap &keys, const s
                 state.mLoopStartTime = key->first;
             else if(key->second == loopstoptag)
                 state.mLoopStopTime = key->first;
-            key++;
+            ++key;
         }
     }
 
@@ -776,7 +776,7 @@ void Animation::play(const std::string &groupname, int priority, int groups, boo
 
     /* Look in reverse; last-inserted source has priority. */
     AnimSourceList::reverse_iterator iter(mAnimSources.rbegin());
-    for(;iter != mAnimSources.rend();iter++)
+    for(;iter != mAnimSources.rend();++iter)
     {
         const NifOgre::TextKeyMap &textkeys = (*iter)->mTextKeys;
         AnimState state;
@@ -795,7 +795,7 @@ void Animation::play(const std::string &groupname, int priority, int groups, boo
             while(textkey != textkeys.end() && textkey->first <= state.mTime)
             {
                 handleTextKey(state, groupname, textkey);
-                textkey++;
+                ++textkey;
             }
 
             if(state.mTime >= state.mLoopStopTime && state.mLoopCount > 0)
@@ -810,7 +810,7 @@ void Animation::play(const std::string &groupname, int priority, int groups, boo
                 while(textkey != textkeys.end() && textkey->first <= state.mTime)
                 {
                     handleTextKey(state, groupname, textkey);
-                    textkey++;
+                    ++textkey;
                 }
             }
 
@@ -965,7 +965,7 @@ Ogre::Vector3 Animation::runAnimation(float duration)
             while(textkey != textkeys.end() && textkey->first <= state.mTime)
             {
                 handleTextKey(state, stateiter->first, textkey);
-                textkey++;
+                ++textkey;
             }
 
             if(state.mTime >= state.mLoopStopTime && state.mLoopCount > 0)
@@ -979,7 +979,7 @@ Ogre::Vector3 Animation::runAnimation(float duration)
                 while(textkey != textkeys.end() && textkey->first <= state.mTime)
                 {
                     handleTextKey(state, stateiter->first, textkey);
-                    textkey++;
+                    ++textkey;
                 }
 
                 if(state.mTime >= state.mLoopStopTime)
diff --git a/apps/openmw/mwrender/debugging.cpp b/apps/openmw/mwrender/debugging.cpp
index ba39d10d5..4f5536ca3 100644
--- a/apps/openmw/mwrender/debugging.cpp
+++ b/apps/openmw/mwrender/debugging.cpp
@@ -106,7 +106,7 @@ ManualObject *Debugging::createPathgridPoints(const ESM::Pathgrid *pathgrid)
     uint32 startIndex = 0;
     for(ESM::Pathgrid::PointList::const_iterator it = pathgrid->mPoints.begin();
         it != pathgrid->mPoints.end();
-        it++, startIndex += 6)
+        ++it, startIndex += 6)
     {
         Vector3 pointPos(it->mX, it->mY, it->mZ);
 
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index 9c10ca84b..f1b1325f7 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -240,25 +240,25 @@ Ogre::AxisAlignedBox Objects::getDimensions(MWWorld::CellStore* cell)
 void Objects::enableLights()
 {
     PtrAnimationMap::const_iterator it = mObjects.begin();
-    for(;it != mObjects.end();it++)
+    for(;it != mObjects.end();++it)
         it->second->enableLights(true);
 }
 
 void Objects::disableLights()
 {
     PtrAnimationMap::const_iterator it = mObjects.begin();
-    for(;it != mObjects.end();it++)
+    for(;it != mObjects.end();++it)
         it->second->enableLights(false);
 }
 
 void Objects::update(float dt, Ogre::Camera* camera)
 {
     PtrAnimationMap::const_iterator it = mObjects.begin();
-    for(;it != mObjects.end();it++)
+    for(;it != mObjects.end();++it)
         it->second->runAnimation(dt);
 
     it = mObjects.begin();
-    for(;it != mObjects.end();it++)
+    for(;it != mObjects.end();++it)
         it->second->preRender(camera);
 
 }
diff --git a/apps/openmw/mwsound/soundmanagerimp.cpp b/apps/openmw/mwsound/soundmanagerimp.cpp
index 0720e798a..33032477f 100644
--- a/apps/openmw/mwsound/soundmanagerimp.cpp
+++ b/apps/openmw/mwsound/soundmanagerimp.cpp
@@ -442,7 +442,7 @@ namespace MWSound
             {
                 snditer->first->setFadeout(duration);
             }
-            snditer++;
+            ++snditer;
         }
     }
 
diff --git a/apps/openmw/mwworld/actionteleport.cpp b/apps/openmw/mwworld/actionteleport.cpp
index 150f0bed2..627c05251 100644
--- a/apps/openmw/mwworld/actionteleport.cpp
+++ b/apps/openmw/mwworld/actionteleport.cpp
@@ -20,7 +20,7 @@ namespace MWWorld
 
         //find any NPC that is following the actor and teleport him too
         std::list<MWWorld::Ptr> followers = MWBase::Environment::get().getMechanicsManager()->getActorsFollowing(actor);
-        for(std::list<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();it++)
+        for(std::list<MWWorld::Ptr>::iterator it = followers.begin();it != followers.end();++it)
         {
             std::cout << "teleporting someone!" << (*it).getCellRef().mRefID;
             executeImp(*it);
diff --git a/apps/openmw/mwworld/cellstore.cpp b/apps/openmw/mwworld/cellstore.cpp
index bbd968a7b..e5f0c4b88 100644
--- a/apps/openmw/mwworld/cellstore.cpp
+++ b/apps/openmw/mwworld/cellstore.cpp
@@ -433,7 +433,6 @@ namespace MWWorld
             while(mCell->getNextRef(esm[index], ref, deleted))
             {
                 // Don't load reference if it was moved to a different cell.
-                std::string lowerCase = Misc::StringUtils::lowerCase(ref.mRefID);
                 ESM::MovedCellRefTracker::const_iterator iter =
                     std::find(mCell->mMovedRefs.begin(), mCell->mMovedRefs.end(), ref.mRefNum);
                 if (iter != mCell->mMovedRefs.end()) {
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 7d531d6d3..d1f328f06 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -671,7 +671,7 @@ namespace MWWorld
     void PhysicsSystem::queueObjectMovement(const Ptr &ptr, const Ogre::Vector3 &movement)
     {
         PtrVelocityList::iterator iter = mMovementQueue.begin();
-        for(;iter != mMovementQueue.end();iter++)
+        for(;iter != mMovementQueue.end();++iter)
         {
             if(iter->first == ptr)
             {
@@ -692,7 +692,7 @@ namespace MWWorld
         {
             const MWBase::World *world = MWBase::Environment::get().getWorld();
             PtrVelocityList::iterator iter = mMovementQueue.begin();
-            for(;iter != mMovementQueue.end();iter++)
+            for(;iter != mMovementQueue.end();++iter)
             {
                 float waterlevel = -std::numeric_limits<float>::max();
                 const ESM::Cell *cell = iter->first.getCell()->getCell();
diff --git a/apps/openmw/mwworld/player.cpp b/apps/openmw/mwworld/player.cpp
index 5e4211faa..b93632d19 100644
--- a/apps/openmw/mwworld/player.cpp
+++ b/apps/openmw/mwworld/player.cpp
@@ -141,17 +141,17 @@ namespace MWWorld
 
             // Find all the actors who might be able to see the player
             std::vector<MWWorld::Ptr> neighbors;
-            MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos), 
+            MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos),
                                         esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
             for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
             {
                 if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) )
-                { 
+                {
                     MWBase::Environment::get().getWindowManager()->setSneakVisibility(false);
                     break;
                 }
             }
-            if (neighbors.size() == 0)
+            if (neighbors.empty())
                 MWBase::Environment::get().getWindowManager()->setSneakVisibility(true);
         }
     }

From f69d61976eff72c00434027fe36db5a3c2d8135a Mon Sep 17 00:00:00 2001
From: Thoronador <thoronador@users.sourceforge.net>
Date: Sun, 27 Apr 2014 23:24:25 +0200
Subject: [PATCH 18/23] minor performance improvements in other apps
 subdirectories

---
 apps/esmtool/esmtool.cpp                       | 2 +-
 apps/esmtool/record.cpp                        | 2 +-
 apps/launcher/graphicspage.cpp                 | 4 ++--
 apps/opencs/view/world/datadisplaydelegate.cpp | 4 ++--
 apps/opencs/view/world/table.cpp               | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 apps/opencs/view/world/datadisplaydelegate.cpp

diff --git a/apps/esmtool/esmtool.cpp b/apps/esmtool/esmtool.cpp
index e9731d626..eef96c8c9 100644
--- a/apps/esmtool/esmtool.cpp
+++ b/apps/esmtool/esmtool.cpp
@@ -333,7 +333,7 @@ int load(Arguments& info)
 
             // Is the user interested in this record type?
             bool interested = true;
-            if (info.types.size() > 0)
+            if (!info.types.empty())
             {
                 std::vector<std::string>::iterator match;
                 match = std::find(info.types.begin(), info.types.end(),
diff --git a/apps/esmtool/record.cpp b/apps/esmtool/record.cpp
index 184d11bb4..25b2a4505 100644
--- a/apps/esmtool/record.cpp
+++ b/apps/esmtool/record.cpp
@@ -124,7 +124,7 @@ void printEffectList(ESM::EffectList effects)
 {
     int i = 0;
     std::vector<ESM::ENAMstruct>::iterator eit;
-    for (eit = effects.mList.begin(); eit != effects.mList.end(); eit++)
+    for (eit = effects.mList.begin(); eit != effects.mList.end(); ++eit)
     {
         std::cout << "  Effect[" << i << "]: " << magicEffectLabel(eit->mEffectID)
                   << " (" << eit->mEffectID << ")" << std::endl;
diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp
index 8abdf0019..638237f34 100644
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@@ -214,13 +214,13 @@ QStringList Launcher::GraphicsPage::getAvailableOptions(const QString &key, Ogre
     uint row = 0;
     Ogre::ConfigOptionMap options = renderer->getConfigOptions();
 
-    for (Ogre::ConfigOptionMap::iterator i = options.begin (); i != options.end (); i++, row++)
+    for (Ogre::ConfigOptionMap::iterator i = options.begin (); i != options.end (); ++i, ++row)
     {
         Ogre::StringVector::iterator opt_it;
         uint idx = 0;
 
         for (opt_it = i->second.possibleValues.begin();
-             opt_it != i->second.possibleValues.end(); opt_it++, idx++)
+             opt_it != i->second.possibleValues.end(); ++opt_it, ++idx)
         {
             if (strcmp (key.toStdString().c_str(), i->first.c_str()) == 0) {
                 result << ((key == "FSAA") ? QString("MSAA ") : QString("")) + QString::fromStdString((*opt_it).c_str()).simplified();
diff --git a/apps/opencs/view/world/datadisplaydelegate.cpp b/apps/opencs/view/world/datadisplaydelegate.cpp
old mode 100755
new mode 100644
index ef0da56ac..c3ec68b52
--- a/apps/opencs/view/world/datadisplaydelegate.cpp
+++ b/apps/opencs/view/world/datadisplaydelegate.cpp
@@ -25,7 +25,7 @@ CSVWorld::DataDisplayDelegate::DataDisplayDelegate(const ValueList &values,
 
 void CSVWorld::DataDisplayDelegate::buildPixmaps ()
 {
-    if (mPixmaps.size() > 0)
+    if (!mPixmaps.empty())
         mPixmaps.clear();
 
     IconList::iterator it = mIcons.begin();
@@ -33,7 +33,7 @@ void CSVWorld::DataDisplayDelegate::buildPixmaps ()
     while (it != mIcons.end())
     {
         mPixmaps.push_back (std::make_pair (it->first, it->second.pixmap (mIconSize) ) );
-        it++;
+        ++it;
     }
 }
 
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index 902ab268a..a5a98aac7 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -298,7 +298,7 @@ void CSVWorld::Table::revertRecord()
     {
         std::vector<std::string> revertableIds = listRevertableSelectedIds();
 
-        if (revertableIds.size()>0)
+        if (!revertableIds.empty())
         {
             if (revertableIds.size()>1)
                 mDocument.getUndoStack().beginMacro (tr ("Revert multiple records"));
@@ -318,7 +318,7 @@ void CSVWorld::Table::deleteRecord()
     {
         std::vector<std::string> deletableIds = listDeletableSelectedIds();
 
-        if (deletableIds.size()>0)
+        if (!deletableIds.empty())
         {
             if (deletableIds.size()>1)
                 mDocument.getUndoStack().beginMacro (tr ("Delete multiple records"));

From c2127845af27a724d0cf55adb614fbfe0c0c5bbb Mon Sep 17 00:00:00 2001
From: Thomas <tluppi@thomas-GE60.(none)>
Date: Sun, 27 Apr 2014 20:54:22 -0400
Subject: [PATCH 19/23] Added onKnockdown command

---
 apps/openmw/mwmechanics/actors.cpp        | 13 ++++++++++-
 apps/openmw/mwmechanics/creaturestats.cpp | 27 +++++++++++++++++++----
 apps/openmw/mwmechanics/creaturestats.hpp |  9 ++++++++
 apps/openmw/mwscript/docs/vmformat.txt    |  4 +++-
 apps/openmw/mwscript/statsextensions.cpp  | 20 ++++++++++++++++-
 apps/openmw/mwworld/player.hpp            |  2 +-
 components/compiler/extensions0.cpp       |  1 +
 components/compiler/opcodes.hpp           |  2 ++
 8 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index d51b02a15..0b0569376 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -889,12 +889,23 @@ namespace MWMechanics
                 iter->second->update(duration);
             }
 
-            // Kill dead actors
+            // Kill dead actors, update some variables
             for(PtrControllerMap::iterator iter(mActors.begin());iter != mActors.end();iter++)
             {
                 const MWWorld::Class &cls = MWWorld::Class::get(iter->first);
                 CreatureStats &stats = cls.getCreatureStats(iter->first);
 
+                //KnockedOutOneFrameLogic
+                //Used for "OnKnockedOut" command
+                //Put here to ensure that it's run for PRECISELY one frame.
+                if(stats.getKnockedDown() && !stats.getKnockedDownOneFrame() && !stats.getKnockedDownOverOneFrame()) { //Start it for one frame if nessesary
+                    stats.setKnockedDownOneFrame(true);
+                }
+                else if (stats.getKnockedDownOneFrame() && !stats.getKnockedDownOverOneFrame()) { //Turn off KnockedOutOneframe
+                    stats.setKnockedDownOneFrame(false);
+                    stats.setKnockedDownOverOneFrame(true);
+                }
+
                 if(!stats.isDead())
                 {
                     if(iter->second->isDead())
diff --git a/apps/openmw/mwmechanics/creaturestats.cpp b/apps/openmw/mwmechanics/creaturestats.cpp
index f81613ed1..40ac92251 100644
--- a/apps/openmw/mwmechanics/creaturestats.cpp
+++ b/apps/openmw/mwmechanics/creaturestats.cpp
@@ -17,7 +17,7 @@ namespace MWMechanics
           mAttacked (false), mHostile (false),
           mAttackingOrSpell(false),
           mIsWerewolf(false),
-          mFallHeight(0), mRecalcDynamicStats(false), mKnockdown(false), mHitRecovery(false), mBlock(false),
+          mFallHeight(0), mRecalcDynamicStats(false), mKnockdown(false), mKnockdownOneFrame(false), mKnockdownOverOneFrame(false), mHitRecovery(false), mBlock(false),
           mMovementFlags(0), mDrawState (DrawState_Nothing), mAttackStrength(0.f)
     {
         for (int i=0; i<4; ++i)
@@ -387,6 +387,8 @@ namespace MWMechanics
     void CreatureStats::setKnockedDown(bool value)
     {
         mKnockdown = value;
+        if(!value) //Resets the "OverOneFrame" flag
+            setKnockedDownOverOneFrame(false);
     }
 
     bool CreatureStats::getKnockedDown() const
@@ -394,6 +396,23 @@ namespace MWMechanics
         return mKnockdown;
     }
 
+    void CreatureStats::setKnockedDownOneFrame(bool value)
+    {
+        mKnockdownOneFrame = value;
+    }
+
+    bool CreatureStats::getKnockedDownOneFrame() const
+    {
+        return mKnockdownOneFrame;
+    }
+
+    void CreatureStats::setKnockedDownOverOneFrame(bool value) {
+        mKnockdownOverOneFrame = value;
+    }
+    bool CreatureStats::getKnockedDownOverOneFrame() const {
+        return mKnockdownOverOneFrame;
+    }
+
     void CreatureStats::setHitRecovery(bool value)
     {
         mHitRecovery = value;
@@ -479,7 +498,7 @@ namespace MWMechanics
     }
 
     // Relates to NPC gold reset delay
-    void CreatureStats::setTradeTime(MWWorld::TimeStamp tradeTime) 
+    void CreatureStats::setTradeTime(MWWorld::TimeStamp tradeTime)
     {
         mTradeTime = tradeTime;
     }
@@ -489,11 +508,11 @@ namespace MWMechanics
         return mTradeTime;
     }
 
-    void CreatureStats::setGoldPool(int pool) 
+    void CreatureStats::setGoldPool(int pool)
     {
         mGoldPool = pool;
     }
-    int CreatureStats::getGoldPool() const 
+    int CreatureStats::getGoldPool() const
     {
         return mGoldPool;
     }
diff --git a/apps/openmw/mwmechanics/creaturestats.hpp b/apps/openmw/mwmechanics/creaturestats.hpp
index 5dc59e5ab..633dc285c 100644
--- a/apps/openmw/mwmechanics/creaturestats.hpp
+++ b/apps/openmw/mwmechanics/creaturestats.hpp
@@ -41,6 +41,8 @@ namespace MWMechanics
         bool mHostile;
         bool mAttackingOrSpell;
         bool mKnockdown;
+        bool mKnockdownOneFrame;
+        bool mKnockdownOverOneFrame;
         bool mHitRecovery;
         bool mBlock;
         unsigned int mMovementFlags;
@@ -188,7 +190,14 @@ namespace MWMechanics
         float getEvasion() const;
 
         void setKnockedDown(bool value);
+        ///Returns true for the entire duration of the actor being knocked down
         bool getKnockedDown() const;
+        void setKnockedDownOneFrame(bool value);
+        ///Returns true only for the first frame of the actor being knocked out; used for "onKnockedOut" command
+        bool getKnockedDownOneFrame() const;
+        void setKnockedDownOverOneFrame(bool value);
+        ///Returns true for all but the first frame of being knocked out; used to know to not reset mKnockedDownOneFrame
+        bool getKnockedDownOverOneFrame() const;
         void setHitRecovery(bool value);
         bool getHitRecovery() const;
         void setBlock(bool value);
diff --git a/apps/openmw/mwscript/docs/vmformat.txt b/apps/openmw/mwscript/docs/vmformat.txt
index ceea34466..bf2273b17 100644
--- a/apps/openmw/mwscript/docs/vmformat.txt
+++ b/apps/openmw/mwscript/docs/vmformat.txt
@@ -388,5 +388,7 @@ op 0x200023c: StopCombat
 op 0x200023d: StopCombatExplicit
 op 0x200023e: GetPcInJail
 op 0x200023f: GetPcTraveling
+op 0x2000240: onKnockout
+op 0x2000241: onKnockoutExplicit
 
-opcodes 0x2000240-0x3ffffff unused
+opcodes 0x2000242-0x3ffffff unused
diff --git a/apps/openmw/mwscript/statsextensions.cpp b/apps/openmw/mwscript/statsextensions.cpp
index 36083e4b0..2f584e7ed 100644
--- a/apps/openmw/mwscript/statsextensions.cpp
+++ b/apps/openmw/mwscript/statsextensions.cpp
@@ -1060,6 +1060,22 @@ namespace MWScript
                 }
         };
 
+        template <class R>
+        class OpOnKnockout : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWWorld::Ptr ptr = R()(runtime);
+
+                    Interpreter::Type_Integer value =
+                        MWWorld::Class::get (ptr).getCreatureStats (ptr).getKnockedDownOneFrame();
+
+                    runtime.push (value);
+                }
+        };
+
         template <class R>
         class OpIsWerewolf : public Interpreter::Opcode0
         {
@@ -1236,6 +1252,8 @@ namespace MWScript
 
             interpreter.installSegment5 (Compiler::Stats::opcodeOnDeath, new OpOnDeath<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Stats::opcodeOnDeathExplicit, new OpOnDeath<ExplicitRef>);
+            interpreter.installSegment5 (Compiler::Stats::opcodeOnKnockout, new OpOnKnockout<ImplicitRef>);
+            interpreter.installSegment5 (Compiler::Stats::opcodeOnKnockoutExplicit, new OpOnKnockout<ExplicitRef>);
 
             interpreter.installSegment5 (Compiler::Stats::opcodeIsWerewolf, new OpIsWerewolf<ImplicitRef>);
             interpreter.installSegment5 (Compiler::Stats::opcodeIsWerewolfExplicit, new OpIsWerewolf<ExplicitRef>);
@@ -1245,7 +1263,7 @@ namespace MWScript
             interpreter.installSegment5 (Compiler::Stats::opcodeUndoWerewolf, new OpSetWerewolf<ImplicitRef, false>);
             interpreter.installSegment5 (Compiler::Stats::opcodeUndoWerewolfExplicit, new OpSetWerewolf<ExplicitRef, false>);
             interpreter.installSegment5 (Compiler::Stats::opcodeSetWerewolfAcrobatics, new OpSetWerewolfAcrobatics<ImplicitRef>);
-            interpreter.installSegment5 (Compiler::Stats::opcodeSetWerewolfAcrobaticsExplicit, new OpSetWerewolfAcrobatics<ExplicitRef>);           
+            interpreter.installSegment5 (Compiler::Stats::opcodeSetWerewolfAcrobaticsExplicit, new OpSetWerewolfAcrobatics<ExplicitRef>);
         }
     }
 }
diff --git a/apps/openmw/mwworld/player.hpp b/apps/openmw/mwworld/player.hpp
index 7e3f7a3cf..638c738bd 100644
--- a/apps/openmw/mwworld/player.hpp
+++ b/apps/openmw/mwworld/player.hpp
@@ -90,7 +90,7 @@ namespace MWWorld
         bool wasTeleported() const;
         void setTeleported(bool teleported);
 
-        ///Checks all actors to see if anyone has an aipackage against you
+        ///Checks all nearby actors to see if anyone has an aipackage against you
         bool isInCombat();
 
         void clear();
diff --git a/components/compiler/extensions0.cpp b/components/compiler/extensions0.cpp
index 531fe2959..db1ac1609 100644
--- a/components/compiler/extensions0.cpp
+++ b/components/compiler/extensions0.cpp
@@ -444,6 +444,7 @@ namespace Compiler
             extensions.registerInstruction ("lowerrank", "", opcodeLowerRank, opcodeLowerRankExplicit);
 
             extensions.registerFunction ("ondeath", 'l', "", opcodeOnDeath, opcodeOnDeathExplicit);
+            extensions.registerFunction ("onknockout", 'l', "", opcodeOnKnockout, opcodeOnKnockoutExplicit);
 
             extensions.registerFunction ("iswerewolf", 'l', "", opcodeIsWerewolf, opcodeIsWerewolfExplicit);
 
diff --git a/components/compiler/opcodes.hpp b/components/compiler/opcodes.hpp
index 27ee182cf..9e36cb68d 100644
--- a/components/compiler/opcodes.hpp
+++ b/components/compiler/opcodes.hpp
@@ -377,6 +377,8 @@ namespace Compiler
         const int opcodeLowerRankExplicit = 0x20001eb;
         const int opcodeOnDeath = 0x20001fc;
         const int opcodeOnDeathExplicit = 0x2000205;
+        const int opcodeOnKnockout = 0x2000240;
+        const int opcodeOnKnockoutExplicit = 0x2000241;
 
         const int opcodeBecomeWerewolf = 0x2000217;
         const int opcodeBecomeWerewolfExplicit = 0x2000218;

From b0bdd233eea81bdf3c42346cc1a75767c7179fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20S=C3=B6derberg?= <lazze_1983@hotmail.com>
Date: Mon, 28 Apr 2014 16:05:27 +0200
Subject: [PATCH 20/23] Center, switch and change text for confirmation buttons

The confirmation buttons for quitting or starting a new game were
driving me crazy by not being ok left and cancel right, as e.g. vanilla
is.

Then I noticed the text isn't the same as in vanilla either. It should
be yes/no, not ok/cancel.

To make it even more authentic I also centered the buttons. Had to
remove autosized buttons for this. I think it looks fine still.

Comments?
---
 files/mygui/openmw_confirmation_dialog.layout | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/mygui/openmw_confirmation_dialog.layout
index 2bd9d8997..b5bf6405d 100644
--- a/files/mygui/openmw_confirmation_dialog.layout
+++ b/files/mygui/openmw_confirmation_dialog.layout
@@ -4,7 +4,7 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 300 130" name="_Main">
         <Property key="Visible" value="false"/>
 
-        <Widget type="EditBox" skin="MW_TextEditClient" position="8 8 284 400" name="Message" align="Left Top Stretch">
+        <Widget type="EditBox" skin="MW_TextEditClient" position="8 8 274 400" name="Message" align="Left Top Stretch">
             <Property key="FontName" value="Default"/>
             <Property key="TextAlign" value="Top HCenter"/>
             <Property key="TextColour" value="0.75 0.6 0.35"/>
@@ -13,18 +13,13 @@
             <Property key="MultiLine" value="true"/>
         </Widget>
 
-        <Widget type="HBox" position="0 89 284 24" align="Right Bottom">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
+        <Widget type="Widget" position="0 89 274 24" align="Center Bottom">
+            <Widget type="Button" skin="MW_Button" name="OkButton" position="77 0 60 24">
+                <Property key="Caption" value="#{sYes}"/>
             </Widget>
-            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton" align="Right Bottom">
-                <Property key="Caption" value="#{sCancel}"/>
-            </Widget>
-            <Widget type="AutoSizedButton" skin="MW_Button" name="OkButton" align="Right Bottom">
-                <Property key="Caption" value="#{sOk}"/>
+            <Widget type="Button" skin="MW_Button" name="CancelButton" position="147 0 60 24">
+                <Property key="Caption" value="#{sNo}"/>
             </Widget>
         </Widget>
-
     </Widget>
-</MyGUI>
-
+</MyGUI>
\ No newline at end of file

From 04e5b9c72c86d04118f6a3e7e22939bd3c9f9963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20S=C3=B6derberg?= <lazze_1983@hotmail.com>
Date: Mon, 28 Apr 2014 16:23:07 +0200
Subject: [PATCH 21/23] Right aligned version/revision

I've always felt that having the version/revision text at the bottom
center in the main menu was a bit out of place. A more common place for
this kind of thing is in one of the corners. I chose bottom right.

Aditionally I right aligned it and changed the v and r in version and
revision to capital letters.

Comments?
---
 apps/openmw/mwgui/mainmenu.cpp     | 4 ++--
 files/mygui/openmw_mainmenu.layout | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwgui/mainmenu.cpp b/apps/openmw/mwgui/mainmenu.cpp
index b6e3915bb..df9c53ea8 100644
--- a/apps/openmw/mwgui/mainmenu.cpp
+++ b/apps/openmw/mwgui/mainmenu.cpp
@@ -28,7 +28,7 @@ namespace MWGui
     {
         getWidget(mVersionText, "VersionText");
         std::stringstream sstream;
-        sstream << "OpenMW version: " << OPENMW_VERSION;
+        sstream << "OpenMW Version: " << OPENMW_VERSION;
 
         // adding info about git hash if available
         std::string rev = OPENMW_VERSION_COMMITHASH;
@@ -36,7 +36,7 @@ namespace MWGui
         if (!rev.empty() && !tag.empty())
         {
                 rev = rev.substr(0,10);
-                sstream << "\nrevision: " <<  rev;
+                sstream << "\nRevision: " <<  rev;
         }
         
         std::string output = sstream.str();
diff --git a/files/mygui/openmw_mainmenu.layout b/files/mygui/openmw_mainmenu.layout
index e8cb23b77..f4c7142ce 100644
--- a/files/mygui/openmw_mainmenu.layout
+++ b/files/mygui/openmw_mainmenu.layout
@@ -2,11 +2,11 @@
 
 <MyGUI type="Layout">
     <!-- The entire screen -->
-    <Widget type="Widget" layer="Windows" position="0 0 300 300" name="_Main" >
-        <Widget type="TextBox" skin="SandText" position="0 250 300 50" align="Bottom" name="VersionText">
-            <Property key="TextAlign" value="Center"/>
+    <Widget type="Widget" layer="Windows" position="0 0 300 300" name="_Main">
+        <Widget type="TextBox" skin="SandText" position="0 250 280 50" align="Bottom Right" name="VersionText">
+            <Property key="TextAlign" value="Right"/>
             <Property key="TextShadow" value="true"/>
             <Property key="TextShadowColour" value="0 0 0"/>
         </Widget>
-    </Widget>	
+    </Widget>
 </MyGUI>

From 0513d0837c32dace48eee31ff373886745ca356f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20S=C3=B6derberg?= <lazze_1983@hotmail.com>
Date: Mon, 28 Apr 2014 17:54:55 +0200
Subject: [PATCH 22/23] Alignment tweaks and autosized buttons workaround

---
 files/mygui/openmw_confirmation_dialog.layout | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/mygui/openmw_confirmation_dialog.layout
index b5bf6405d..e299c7b0b 100644
--- a/files/mygui/openmw_confirmation_dialog.layout
+++ b/files/mygui/openmw_confirmation_dialog.layout
@@ -4,7 +4,7 @@
     <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 300 130" name="_Main">
         <Property key="Visible" value="false"/>
 
-        <Widget type="EditBox" skin="MW_TextEditClient" position="8 8 274 400" name="Message" align="Left Top Stretch">
+        <Widget type="EditBox" skin="MW_TextEditClient" position="16 8 268 130" name="Message" align="Center Top">
             <Property key="FontName" value="Default"/>
             <Property key="TextAlign" value="Top HCenter"/>
             <Property key="TextColour" value="0.75 0.6 0.35"/>
@@ -13,13 +13,25 @@
             <Property key="MultiLine" value="true"/>
         </Widget>
 
-        <Widget type="Widget" position="0 89 274 24" align="Center Bottom">
-            <Widget type="Button" skin="MW_Button" name="OkButton" position="77 0 60 24">
+         <Widget type="HBox" position="0 89 138 24" align="Left Bottom">
+            <Widget type="Widget">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
+
+            <Widget type="AutoSizedButton" skin="MW_Button" name="OkButton">
                 <Property key="Caption" value="#{sYes}"/>
             </Widget>
-            <Widget type="Button" skin="MW_Button" name="CancelButton" position="147 0 60 24">
+        </Widget>
+
+        <Widget type="HBox" position="146 89 138 24" align="Left Bottom">
+            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
                 <Property key="Caption" value="#{sNo}"/>
             </Widget>
+
+            <Widget type="Widget">
+                <UserString key="HStretch" value="true"/>
+            </Widget>
         </Widget>
+
     </Widget>
 </MyGUI>
\ No newline at end of file

From d530bbe5cddd96b0483f2c35573901d22de4cf73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20S=C3=B6derberg?= <lazze_1983@hotmail.com>
Date: Mon, 28 Apr 2014 18:52:53 +0200
Subject: [PATCH 23/23] Implemented Scrawls alternative workaround.

---
 files/mygui/openmw_confirmation_dialog.layout | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/mygui/openmw_confirmation_dialog.layout
index e299c7b0b..edeed539c 100644
--- a/files/mygui/openmw_confirmation_dialog.layout
+++ b/files/mygui/openmw_confirmation_dialog.layout
@@ -13,25 +13,19 @@
             <Property key="MultiLine" value="true"/>
         </Widget>
 
-         <Widget type="HBox" position="0 89 138 24" align="Left Bottom">
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
+        <Widget type="VBox" position="0 89 292 24" align="Right Bottom">
+            <Widget type="HBox">
+                <Property key="Spacing" value="8"/>
+
+                <Widget type="AutoSizedButton" skin="MW_Button" name="OkButton" align="Right Bottom">
+                    <Property key="Caption" value="#{sYes}"/>
+                </Widget>
+                <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton" align="Right Bottom">
+                    <Property key="Caption" value="#{sNo}"/>
+                </Widget>
             </Widget>
 
-            <Widget type="AutoSizedButton" skin="MW_Button" name="OkButton">
-                <Property key="Caption" value="#{sYes}"/>
-            </Widget>
+            <Widget type="Widget"/>
         </Widget>
-
-        <Widget type="HBox" position="146 89 138 24" align="Left Bottom">
-            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
-                <Property key="Caption" value="#{sNo}"/>
-            </Widget>
-
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
-        </Widget>
-
     </Widget>
 </MyGUI>
\ No newline at end of file