From b7b51f24d63696436157086ed79356704889d084 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 3 Jan 2013 11:20:25 +0100
Subject: [PATCH 01/27] added new Role for table headers (Role_Display)

---
 apps/opencs/model/world/columnbase.cpp |  4 ++--
 apps/opencs/model/world/columnbase.hpp | 18 ++++++++++++++----
 apps/opencs/model/world/columns.hpp    |  9 +++++----
 apps/opencs/model/world/idtable.cpp    |  3 +++
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/apps/opencs/model/world/columnbase.cpp b/apps/opencs/model/world/columnbase.cpp
index 7adc7e6c3..134c582c4 100644
--- a/apps/opencs/model/world/columnbase.cpp
+++ b/apps/opencs/model/world/columnbase.cpp
@@ -1,8 +1,8 @@
 
 #include "columnbase.hpp"
 
-CSMWorld::ColumnBase::ColumnBase (const std::string& title, int flags)
-: mTitle (title), mFlags (flags)
+CSMWorld::ColumnBase::ColumnBase (const std::string& title, Display displayType, int flags)
+: mTitle (title), mDisplayType (displayType), mFlags (flags)
 {}
 
 CSMWorld::ColumnBase::~ColumnBase() {}
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index dc077eff6..38b73ee3f 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -14,7 +14,8 @@ namespace CSMWorld
     {
         enum Roles
         {
-            Role_Flags = Qt::UserRole
+            Role_Flags = Qt::UserRole,
+            Role_Display = Qt::UserRole+1
         };
 
         enum Flags
@@ -23,10 +24,18 @@ namespace CSMWorld
             Flag_Dialogue = 2 // column should be displayed in dialogue view
         };
 
+        enum Display
+        {
+            Display_String,
+            Display_Integer,
+            Display_Float
+        };
+
         std::string mTitle;
         int mFlags;
+        Display mDisplayType;
 
-        ColumnBase (const std::string& title, int flag);
+        ColumnBase (const std::string& title, Display displayType, int flag);
 
         virtual ~ColumnBase();
 
@@ -34,6 +43,7 @@ namespace CSMWorld
 
         virtual bool isUserEditable() const;
         ///< Can this column be edited directly by the user?
+
     };
 
     template<typename ESXRecordT>
@@ -42,8 +52,8 @@ namespace CSMWorld
         std::string mTitle;
         int mFlags;
 
-        Column (const std::string& title, int flags = Flag_Table | Flag_Dialogue)
-        : ColumnBase (title, flags) {}
+        Column (const std::string& title, Display displayType, int flags = Flag_Table | Flag_Dialogue)
+        : ColumnBase (title, displayType, flags) {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const = 0;
 
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index 5abf4ea8b..1e2de9265 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -8,7 +8,7 @@ namespace CSMWorld
     template<typename ESXRecordT>
     struct FloatValueColumn : public Column<ESXRecordT>
     {
-        FloatValueColumn() : Column<ESXRecordT> ("Value") {}
+        FloatValueColumn() : Column<ESXRecordT> ("Value", ColumnBase::Display_Float) {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
@@ -31,7 +31,7 @@ namespace CSMWorld
     template<typename ESXRecordT>
     struct StringIdColumn : public Column<ESXRecordT>
     {
-        StringIdColumn() : Column<ESXRecordT> ("ID") {}
+        StringIdColumn() : Column<ESXRecordT> ("ID", ColumnBase::Display_String) {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
@@ -47,7 +47,7 @@ namespace CSMWorld
     template<typename ESXRecordT>
     struct RecordStateColumn : public Column<ESXRecordT>
     {
-        RecordStateColumn() : Column<ESXRecordT> ("*") {}
+        RecordStateColumn() : Column<ESXRecordT> ("*", ColumnBase::Display_Integer) {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
@@ -78,7 +78,8 @@ namespace CSMWorld
     {
         int mType;
 
-        FixedRecordTypeColumn (int type) : Column<ESXRecordT> ("Type", 0), mType (type) {}
+        FixedRecordTypeColumn (int type)
+        : Column<ESXRecordT> ("Type", ColumnBase::Display_Integer, 0), mType (type) {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 2815e318c..afed6b6ed 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -51,6 +51,9 @@ QVariant CSMWorld::IdTable::headerData (int section, Qt::Orientation orientation
     if (role==ColumnBase::Role_Flags)
         return mIdCollection->getColumn (section).mFlags;
 
+    if (role==ColumnBase::Role_Display)
+        return mIdCollection->getColumn (section).mDisplayType;
+
     return QVariant();
 }
 

From d4a9236ae5ef0596dcbf53eaba64948abaa7692e Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 8 Jan 2013 14:59:40 +0100
Subject: [PATCH 02/27] hocking up dialogue sub view to a widget mapper

---
 apps/opencs/view/world/dialoguesubview.cpp | 52 ++++++++++++++++++++++
 apps/opencs/view/world/dialoguesubview.hpp |  3 ++
 2 files changed, 55 insertions(+)

diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 354223757..6138fd3f5 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -4,6 +4,10 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QAbstractTableModel>
+#include <QDoubleSpinBox>
+#include <QSpinBox>
+#include <QLineEdit>
+#include <QDataWidgetMapper>
 
 #include "../../model/world/columnbase.hpp"
 
@@ -23,6 +27,9 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
 
     int columns = model->columnCount();
 
+    mWidgetMapper = new QDataWidgetMapper (this);
+    mWidgetMapper->setModel (model);
+
     for (int i=0; i<columns; ++i)
     {
         int flags = model->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
@@ -30,8 +37,53 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
         if (flags & CSMWorld::ColumnBase::Flag_Dialogue)
         {
             layout->addWidget (new QLabel (model->headerData (i, Qt::Horizontal).toString()), i, 0);
+
+            CSMWorld::ColumnBase::Display display = static_cast<CSMWorld::ColumnBase::Display>
+                (model->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Display).toInt());
+
+            QWidget *widget = 0;
+
+            if (model->flags (model->index (0, i)) & Qt::ItemIsEditable)
+            {
+                switch (display)
+                {
+                    case CSMWorld::ColumnBase::Display_String:
+
+                        layout->addWidget (widget = new QLineEdit, i, 1);
+                        break;
+
+                    case CSMWorld::ColumnBase::Display_Integer:
+
+                        /// \todo configure widget properly (range)
+                        layout->addWidget (widget = new QSpinBox, i, 1);
+                        break;
+
+                    case CSMWorld::ColumnBase::Display_Float:
+
+                        /// \todo configure widget properly (range, format?)
+                        layout->addWidget (widget = new QDoubleSpinBox, i, 1);
+                        break;
+                }
+            }
+            else
+            {
+                switch (display)
+                {
+                    case CSMWorld::ColumnBase::Display_String:
+                    case CSMWorld::ColumnBase::Display_Integer:
+                    case CSMWorld::ColumnBase::Display_Float:
+
+                        layout->addWidget (widget = new QLabel, i, 1);
+                        break;
+                }
+            }
+
+            if (widget)
+                mWidgetMapper->addMapping (widget, i);
         }
     }
+
+    mWidgetMapper->toFirst(); /// \todo use the correct row instead
 }
 
 void CSVWorld::DialogueSubView::setEditLock (bool locked)
diff --git a/apps/opencs/view/world/dialoguesubview.hpp b/apps/opencs/view/world/dialoguesubview.hpp
index c57dab108..64715f5b7 100644
--- a/apps/opencs/view/world/dialoguesubview.hpp
+++ b/apps/opencs/view/world/dialoguesubview.hpp
@@ -3,6 +3,8 @@
 
 #include "../doc/subview.hpp"
 
+class QDataWidgetMapper;
+
 namespace CSMDoc
 {
     class Document;
@@ -12,6 +14,7 @@ namespace CSVWorld
 {
     class DialogueSubView : public CSVDoc::SubView
     {
+            QDataWidgetMapper *mWidgetMapper;
 
         public:
 

From d4ca954d47c0e19ee767efd2f263183ddd0b2839 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sat, 12 Jan 2013 18:31:57 +0000
Subject: [PATCH 03/27] scripts on items in containers added to script list on
 cell change

---
 apps/openmw/mwworld/localscripts.cpp | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index a821ad486..9c9131008 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -3,6 +3,10 @@
 #include "esmstore.hpp"
 #include "cellstore.hpp"
 
+#include "class.hpp"
+#include "containerstore.hpp"
+
+
 namespace
 {
     template<typename T>
@@ -19,6 +23,32 @@ namespace
             }
         }
     }
+
+    // Adds scripts for items in containers (containers/npcs/creatures)
+    template<typename T>
+    void listCellScriptsCont (MWWorld::LocalScripts& localScripts,
+        MWWorld::CellRefList<T>& cellRefList,  MWWorld::Ptr::CellStore *cell)
+    {
+        for (typename MWWorld::CellRefList<T>::List::iterator iter (
+            cellRefList.mList.begin());
+            iter!=cellRefList.mList.end(); ++iter)
+        {
+           
+            MWWorld::Ptr containerPtr (&*iter, cell); 
+            
+            MWWorld::ContainerStore& container = MWWorld::Class::get(containerPtr).getContainerStore(containerPtr);
+            for(MWWorld::ContainerStoreIterator it3 = container.begin(); it3 != container.end(); ++it3)
+            {
+                std::string script = MWWorld::Class::get(*it3).getScript(*it3);
+                if(script != "")
+                {
+                    MWWorld::Ptr item = *it3;
+                    item.mCell = cell;
+                    localScripts.add (script, item);
+                }
+            }
+        }
+    }
 }
 
 MWWorld::LocalScripts::LocalScripts (const MWWorld::ESMStore& store) : mStore (store) {}
@@ -78,13 +108,16 @@ void MWWorld::LocalScripts::addCell (Ptr::CellStore *cell)
     listCellScripts (*this, cell->mBooks, cell);
     listCellScripts (*this, cell->mClothes, cell);
     listCellScripts (*this, cell->mContainers, cell);
+    listCellScriptsCont (*this, cell->mContainers, cell);
     listCellScripts (*this, cell->mCreatures, cell);
+    listCellScriptsCont (*this, cell->mCreatures, cell);
     listCellScripts (*this, cell->mDoors, cell);
     listCellScripts (*this, cell->mIngreds, cell);
     listCellScripts (*this, cell->mLights, cell);
     listCellScripts (*this, cell->mLockpicks, cell);
     listCellScripts (*this, cell->mMiscItems, cell);
     listCellScripts (*this, cell->mNpcs, cell);
+    listCellScriptsCont (*this, cell->mNpcs, cell);
     listCellScripts (*this, cell->mProbes, cell);
     listCellScripts (*this, cell->mRepairs, cell);
     listCellScripts (*this, cell->mWeapons, cell);

From c138e00aa250b1cca9cd8484b085df6830218685 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 13 Jan 2013 17:05:12 +0000
Subject: [PATCH 04/27] objects scripts are now stopped when they are removed
 from a container

---
 apps/openmw/mwbase/world.hpp         |  4 ++++
 apps/openmw/mwworld/localscripts.cpp | 14 ++++++++++++++
 apps/openmw/mwworld/localscripts.hpp |  3 +++
 apps/openmw/mwworld/refdata.cpp      |  6 ++++++
 apps/openmw/mwworld/worldimp.cpp     |  5 +++++
 apps/openmw/mwworld/worldimp.hpp     |  3 +++
 6 files changed, 35 insertions(+)

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index a576912c0..2ce7ce2c7 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -45,6 +45,7 @@ namespace MWWorld
     class Ptr;
     class TimeStamp;
     class ESMStore;
+    class RefData;
 }
 
 namespace MWBase
@@ -138,6 +139,9 @@ namespace MWBase
 
             virtual std::string getCurrentCellName() const = 0;
 
+            virtual void removeRefScript (MWWorld::RefData *ref) = 0;
+            //< Remove the script attached to ref from mLocalScripts
+
             virtual MWWorld::Ptr getPtr (const std::string& name, bool activeOnly) = 0;
             ///< Return a pointer to a liveCellRef with the given name.
             /// \param activeOnly do non search inactive cells.
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 9c9131008..2fa0d4086 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -146,6 +146,20 @@ void MWWorld::LocalScripts::clearCell (Ptr::CellStore *cell)
     }
 }
 
+void MWWorld::LocalScripts::remove (RefData *ref)
+{
+    for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
+        iter!=mScripts.end(); ++iter)
+        if (&(iter->second.getRefData()) == ref)
+        {
+            if (iter==mIter)
+                ++mIter;
+
+            mScripts.erase (iter);
+            break;
+        }
+}
+
 void MWWorld::LocalScripts::remove (const Ptr& ptr)
 {
     for (std::list<std::pair<std::string, Ptr> >::iterator iter = mScripts.begin();
diff --git a/apps/openmw/mwworld/localscripts.hpp b/apps/openmw/mwworld/localscripts.hpp
index 028dcdeda..840243fff 100644
--- a/apps/openmw/mwworld/localscripts.hpp
+++ b/apps/openmw/mwworld/localscripts.hpp
@@ -10,6 +10,7 @@ namespace MWWorld
 {
     struct ESMStore;
     class CellStore;
+    class RefData;
 
     /// \brief List of active local scripts
     class LocalScripts
@@ -47,6 +48,8 @@ namespace MWWorld
 
             void clearCell (CellStore *cell);
             ///< Remove all scripts belonging to \a cell.
+            
+            void remove (RefData *ref);
 
             void remove (const Ptr& ptr);
             ///< Remove script for given reference (ignored if reference does not have a scirpt listed).
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index 5630bfd5c..4be287810 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -6,6 +6,9 @@
 #include "customdata.hpp"
 #include "cellstore.hpp"
 
+#include "../mwbase/environment.hpp"
+#include "../mwbase/world.hpp"
+
 namespace MWWorld
 {
     void RefData::copy (const RefData& refData)
@@ -107,6 +110,9 @@ namespace MWWorld
 
     void RefData::setCount (int count)
     {
+        if(count == 0)
+            MWBase::Environment::get().getWorld()->removeRefScript(this);
+        
         mCount = count;
     }
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index f49b4bf9b..716cd6e96 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -341,6 +341,11 @@ namespace MWWorld
         return name;
     }
 
+    void World::removeRefScript (MWWorld::RefData *ref)
+    {
+        mLocalScripts.remove (ref);
+    }
+
     Ptr World::getPtr (const std::string& name, bool activeOnly)
     {
         // the player is always in an active cell.
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 7e89c1d87..905e6fd96 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -172,6 +172,9 @@ namespace MWWorld
             virtual std::vector<std::string> getGlobals () const;
             
             virtual std::string getCurrentCellName () const;
+            
+            virtual void removeRefScript (MWWorld::RefData *ref);
+            //< Remove the script attached to ref from mLocalScripts
 
             virtual Ptr getPtr (const std::string& name, bool activeOnly);
             ///< Return a pointer to a liveCellRef with the given name.

From 6fc64e8a4e9d374040f29343029ec197f5323cdd Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 13 Jan 2013 19:49:56 +0000
Subject: [PATCH 05/27] scripts run for items added to containers, and scripted
 items in player inv handled correctly

---
 apps/openmw/mwworld/containerstore.cpp | 28 +++++++++++++++++++++++++-
 apps/openmw/mwworld/containerstore.hpp |  1 +
 apps/openmw/mwworld/localscripts.cpp   |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index db4537daf..6884aa6c8 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -15,6 +15,8 @@
 #include "manualref.hpp"
 #include "refdata.hpp"
 #include "class.hpp"
+#include "localscripts.hpp"
+#include "player.hpp"
 
 namespace
 {
@@ -71,6 +73,30 @@ bool MWWorld::ContainerStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
 }
 
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
+{
+    MWWorld::ContainerStoreIterator it = realAdd(ptr);
+    MWWorld::Ptr item = *it;
+
+    std::string script = MWWorld::Class::get(item).getScript(item);
+    if(script != "")
+    {
+        CellStore *cell;
+
+        Ptr player = MWBase::Environment::get().getWorld ()->getPlayer().getPlayer();
+        // Items in players inventory have cell set to 0, so their scripts will never be removed
+        if(&(MWWorld::Class::get (player).getContainerStore (player)) == this)
+            cell = 0;
+        else
+            cell = player.getCell();
+
+        item.mCell = cell;
+        MWBase::Environment::get().getWorld()->getLocalScripts().add(script, item);
+    }
+
+    return it;
+}
+
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::realAdd (const Ptr& ptr)
 {
     int type = getType(ptr);
 
@@ -162,7 +188,7 @@ void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const MWWor
         }
 
         ref.getPtr().getRefData().setCount (std::abs(iter->mCount)); /// \todo implement item restocking (indicated by negative count)
-        add (ref.getPtr());
+        realAdd (ref.getPtr());
     }
 
     flagAsModified();
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index 1297fc53c..e274ee130 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -52,6 +52,7 @@ namespace MWWorld
             int mStateId;
             mutable float mCachedWeight;
             mutable bool mWeightUpToDate;
+            ContainerStoreIterator realAdd (const Ptr& ptr);
 
         public:
 
diff --git a/apps/openmw/mwworld/localscripts.cpp b/apps/openmw/mwworld/localscripts.cpp
index 2fa0d4086..5ec5ca9b5 100644
--- a/apps/openmw/mwworld/localscripts.cpp
+++ b/apps/openmw/mwworld/localscripts.cpp
@@ -134,7 +134,7 @@ void MWWorld::LocalScripts::clearCell (Ptr::CellStore *cell)
 
     while (iter!=mScripts.end())
     {
-        if (iter->second.getCell()==cell)
+        if (iter->second.mCell==cell)
         {
             if (iter==mIter)
                ++mIter;

From 2d96f528646e0799837ad29463b97c548f1d3df9 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 19 Jan 2013 14:29:14 +0100
Subject: [PATCH 06/27] select correct record when opening a dialogue sub view

---
 apps/opencs/view/world/dialoguesubview.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 6138fd3f5..2bf6577b1 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -10,6 +10,7 @@
 #include <QDataWidgetMapper>
 
 #include "../../model/world/columnbase.hpp"
+#include "../../model/world/idtable.hpp"
 
 CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document,
     bool createAndDelete)
@@ -83,7 +84,8 @@ CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id, CSM
         }
     }
 
-    mWidgetMapper->toFirst(); /// \todo use the correct row instead
+    mWidgetMapper->setCurrentModelIndex (
+        dynamic_cast<CSMWorld::IdTable&> (*model).getModelIndex (id.getId(), 0));
 }
 
 void CSVWorld::DialogueSubView::setEditLock (bool locked)

From d6b956cdcf45715329d080deb0783c74244821dd Mon Sep 17 00:00:00 2001
From: Nathan Jeffords <blunted2night@gmail.com>
Date: Tue, 15 Jan 2013 08:27:58 -0800
Subject: [PATCH 07/27] fixed swapped day & month fields when created a stamped
 journal entry

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

diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index e6141884c..5ffde5499 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -61,8 +61,8 @@ namespace MWDialogue
     StampedJournalEntry StampedJournalEntry::makeFromQuest (const std::string& topic, int index)
     {
         int day = MWBase::Environment::get().getWorld()->getGlobalVariable ("dayspassed").mLong;
-        int month = MWBase::Environment::get().getWorld()->getGlobalVariable ("day").mLong;
-        int dayOfMonth = MWBase::Environment::get().getWorld()->getGlobalVariable ("month").mLong;
+        int month = MWBase::Environment::get().getWorld()->getGlobalVariable ("month").mLong;
+        int dayOfMonth = MWBase::Environment::get().getWorld()->getGlobalVariable ("day").mLong;
 
         return StampedJournalEntry (topic, idFromIndex (topic, index), day, month, dayOfMonth);
     }

From 528c3da6dae85a8c4c1903b16b3322742ca02292 Mon Sep 17 00:00:00 2001
From: Nathan Jeffords <blunted2night@gmail.com>
Date: Sat, 19 Jan 2013 16:20:22 -0800
Subject: [PATCH 08/27] record heard topics in journal

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index b83f495ad..a3bb640e6 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -20,6 +20,7 @@
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/journal.hpp"
 #include "../mwbase/scriptmanager.hpp"
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
@@ -269,6 +270,7 @@ namespace MWDialogue
 
             MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
             win->addText (Interpreter::fixDefinesDialog(info->mResponse, interpreterContext));
+            MWBase::Environment::get().getJournal()->addTopic (topic, info->mId);
 
             executeScript (info->mResultScript);
 
@@ -420,6 +422,7 @@ namespace MWDialogue
 
                         MWScript::InterpreterContext interpreterContext(&mActor.getRefData().getLocals(),mActor);
                         MWBase::Environment::get().getWindowManager()->getDialogueWindow()->addText (Interpreter::fixDefinesDialog(text, interpreterContext));
+                        MWBase::Environment::get().getJournal()->addTopic (mLastTopic, info->mId);
                         executeScript (info->mResultScript);
                         mLastTopic = mLastTopic;
                         mLastDialogue = *info;

From 4c7ae3d1ff296b4c7cc96fcd2c533de3ace00443 Mon Sep 17 00:00:00 2001
From: Nathan Jeffords <blunted2night@gmail.com>
Date: Sat, 19 Jan 2013 16:21:15 -0800
Subject: [PATCH 09/27] prevent duplicate journal entries from being recorded

---
 apps/openmw/mwdialogue/journalimp.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index 2b2c60381..c623ddc85 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -31,6 +31,12 @@ namespace MWDialogue
 
     void Journal::addEntry (const std::string& id, int index)
     {
+        // bail out of we already have heard this...
+        auto infoId = JournalEntry::idFromIndex (id, index);
+        for (auto i = mJournal.begin (); i != mJournal.end (); ++i)
+            if (i->mTopic == id && i->mInfoId == infoId)
+                return;
+
         StampedJournalEntry entry = StampedJournalEntry::makeFromQuest (id, index);
 
         mJournal.push_back (entry);

From f55da179337a2591438f8ccad5cd9231203dce77 Mon Sep 17 00:00:00 2001
From: Nathan Jeffords <blunted2night@gmail.com>
Date: Sat, 19 Jan 2013 16:21:41 -0800
Subject: [PATCH 10/27] made some journal accessor methods constant

---
 apps/openmw/mwdialogue/topic.cpp | 6 +++---
 apps/openmw/mwdialogue/topic.hpp | 8 +++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwdialogue/topic.cpp b/apps/openmw/mwdialogue/topic.cpp
index b6e7c07ae..3253b20d6 100644
--- a/apps/openmw/mwdialogue/topic.cpp
+++ b/apps/openmw/mwdialogue/topic.cpp
@@ -27,17 +27,17 @@ namespace MWDialogue
         mEntries.push_back (entry.mInfoId);
     }
 
-    Topic::TEntryIter Topic::begin()
+    Topic::TEntryIter Topic::begin() const
     {
         return mEntries.begin();
     }
 
-    Topic::TEntryIter Topic::end()
+    Topic::TEntryIter Topic::end() const
     {
         return mEntries.end();
     }
 
-    JournalEntry Topic::getEntry (const std::string& infoId)
+    JournalEntry Topic::getEntry (const std::string& infoId) const
     {
         return JournalEntry (mTopic, infoId);
     }
diff --git a/apps/openmw/mwdialogue/topic.hpp b/apps/openmw/mwdialogue/topic.hpp
index 566f60ab0..c3f0baabc 100644
--- a/apps/openmw/mwdialogue/topic.hpp
+++ b/apps/openmw/mwdialogue/topic.hpp
@@ -34,13 +34,15 @@ namespace MWDialogue
             ///
             /// \note Redundant entries are ignored.
 
-            TEntryIter begin();
+            std::string const & getName () const { return mTopic; }
+
+            TEntryIter begin() const;
             ///< Iterator pointing to the begin of the journal for this topic.
 
-            TEntryIter end();
+            TEntryIter end() const;
             ///< Iterator pointing past the end of the journal for this topic.
 
-            JournalEntry getEntry (const std::string& infoId);
+            JournalEntry getEntry (const std::string& infoId) const;
     };
 }
 

From 3c6ddd7fa783068477a5d0e91605b2037803558e Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 14:10:04 +0000
Subject: [PATCH 11/27] fixed isInCell method

---
 apps/openmw/mwworld/containerstore.cpp | 1 +
 apps/openmw/mwworld/ptr.hpp            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 6884aa6c8..7a4120d0a 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -90,6 +90,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
             cell = player.getCell();
 
         item.mCell = cell;
+        item.mContainerStore = 0;
         MWBase::Environment::get().getWorld()->getLocalScripts().add(script, item);
     }
 
diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp
index 594ddef2d..d97ebcc6e 100644
--- a/apps/openmw/mwworld/ptr.hpp
+++ b/apps/openmw/mwworld/ptr.hpp
@@ -74,7 +74,7 @@ namespace MWWorld
 
             bool isInCell() const
             {
-                return (mCell != 0);
+                return (mContainerStore == 0);
             }
 
             void setContainerStore (ContainerStore *store);

From 665a530e10c912e5159929f7e4fcb5300d9559a4 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 14:14:34 +0000
Subject: [PATCH 12/27] renamed realAdd to addImp

---
 apps/openmw/mwworld/containerstore.cpp | 6 +++---
 apps/openmw/mwworld/containerstore.hpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index 7a4120d0a..bca4073b5 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -74,7 +74,7 @@ bool MWWorld::ContainerStore::stacks(const Ptr& ptr1, const Ptr& ptr2)
 
 MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
 {
-    MWWorld::ContainerStoreIterator it = realAdd(ptr);
+    MWWorld::ContainerStoreIterator it = addImp(ptr);
     MWWorld::Ptr item = *it;
 
     std::string script = MWWorld::Class::get(item).getScript(item);
@@ -97,7 +97,7 @@ MWWorld::ContainerStoreIterator MWWorld::ContainerStore::add (const Ptr& ptr)
     return it;
 }
 
-MWWorld::ContainerStoreIterator MWWorld::ContainerStore::realAdd (const Ptr& ptr)
+MWWorld::ContainerStoreIterator MWWorld::ContainerStore::addImp (const Ptr& ptr)
 {
     int type = getType(ptr);
 
@@ -189,7 +189,7 @@ void MWWorld::ContainerStore::fill (const ESM::InventoryList& items, const MWWor
         }
 
         ref.getPtr().getRefData().setCount (std::abs(iter->mCount)); /// \todo implement item restocking (indicated by negative count)
-        realAdd (ref.getPtr());
+        addImp (ref.getPtr());
     }
 
     flagAsModified();
diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp
index e274ee130..e4f75d547 100644
--- a/apps/openmw/mwworld/containerstore.hpp
+++ b/apps/openmw/mwworld/containerstore.hpp
@@ -52,7 +52,7 @@ namespace MWWorld
             int mStateId;
             mutable float mCachedWeight;
             mutable bool mWeightUpToDate;
-            ContainerStoreIterator realAdd (const Ptr& ptr);
+            ContainerStoreIterator addImp (const Ptr& ptr);
 
         public:
 

From abe25c5f662def09b98ac7afe076258e439294a0 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 14:24:55 +0000
Subject: [PATCH 13/27] removed use of c++11 auto

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

diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index c623ddc85..5e2bc6bc0 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -32,8 +32,8 @@ namespace MWDialogue
     void Journal::addEntry (const std::string& id, int index)
     {
         // bail out of we already have heard this...
-        auto infoId = JournalEntry::idFromIndex (id, index);
-        for (auto i = mJournal.begin (); i != mJournal.end (); ++i)
+        std::string infoId = JournalEntry::idFromIndex (id, index);
+        for (TEntryIter i = mJournal.begin (); i != mJournal.end (); ++i)
             if (i->mTopic == id && i->mInfoId == infoId)
                 return;
 

From bbac63bff7cd2f16f00c2c9cde102f1dbdbb7c02 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 14:25:44 +0000
Subject: [PATCH 14/27] Ignore vim swap files

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9734ac35c..776e2b659 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ makefile
 data
 *.kdev4
 CMakeLists.txt.user
+*.swp
+*.swo

From 28c580d2805ee7a88a6a00b2fae573eac3f8807f Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 15:43:52 +0000
Subject: [PATCH 15/27] disabling and enabling containers causes scripts on
 contents to be disabled and enabled accordingly

---
 apps/openmw/mwworld/worldimp.cpp | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 716cd6e96..bd48875e7 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -406,6 +406,24 @@ namespace MWWorld
         if (!reference.getRefData().isEnabled())
         {
             reference.getRefData().enable();
+            
+            /* run scripts on container contents */
+            if( reference.getTypeName()==typeid (ESM::Container).name() ||
+                reference.getTypeName()==typeid (ESM::NPC).name() ||
+                reference.getTypeName()==typeid (ESM::Creature).name())
+            {
+                MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+                for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+                {
+                    std::string script = MWWorld::Class::get(*it).getScript(*it);
+                    if(script != "")
+                    {
+                        MWWorld::Ptr item = *it;
+                        item.mCell = reference.getCell();
+                        mLocalScripts.add (script, item);
+                    }
+                }
+            }
 
             if(mWorldScene->getActiveCells().find (reference.getCell()) != mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->addObjectToScene (reference);
@@ -417,6 +435,23 @@ namespace MWWorld
         if (reference.getRefData().isEnabled())
         {
             reference.getRefData().disable();
+            
+            /* remove scripts on container contents */
+            if( reference.getTypeName()==typeid (ESM::Container).name() ||
+                reference.getTypeName()==typeid (ESM::NPC).name() ||
+                reference.getTypeName()==typeid (ESM::Creature).name())
+            {
+                MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+                for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+                {
+                    std::string script = MWWorld::Class::get(*it).getScript(*it);
+                    if(script != "")
+                    {
+                        MWWorld::Ptr item = *it;
+                        mLocalScripts.remove (item);
+                    }
+                }
+            }
 
             if(mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->removeObjectFromScene (reference);

From 23dada0ee4e4d35ff14983a6ff515b30d228b7cb Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 16:38:56 +0000
Subject: [PATCH 16/27] moved script handling on enable / disable into their
 own functions

---
 apps/openmw/mwworld/worldimp.cpp | 76 ++++++++++++++++++--------------
 apps/openmw/mwworld/worldimp.hpp |  3 ++
 2 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index bd48875e7..ee18e5d95 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -401,34 +401,57 @@ namespace MWWorld
         return MWWorld::Ptr();
     }
 
+    void World::addContainerScripts(const Ptr& reference, Ptr::CellStore * cell)
+    {
+        if( reference.getTypeName()==typeid (ESM::Container).name() ||
+            reference.getTypeName()==typeid (ESM::NPC).name() ||
+            reference.getTypeName()==typeid (ESM::Creature).name())
+        {
+            MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+            for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+            {
+                std::string script = MWWorld::Class::get(*it).getScript(*it);
+                if(script != "")
+                {
+                    MWWorld::Ptr item = *it;
+                    item.mCell = cell;
+                    mLocalScripts.add (script, item);
+                }
+            }
+        }
+    }
+
     void World::enable (const Ptr& reference)
     {
         if (!reference.getRefData().isEnabled())
         {
             reference.getRefData().enable();
             
-            /* run scripts on container contents */
-            if( reference.getTypeName()==typeid (ESM::Container).name() ||
-                reference.getTypeName()==typeid (ESM::NPC).name() ||
-                reference.getTypeName()==typeid (ESM::Creature).name())
-            {
-                MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
-                for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
-                {
-                    std::string script = MWWorld::Class::get(*it).getScript(*it);
-                    if(script != "")
-                    {
-                        MWWorld::Ptr item = *it;
-                        item.mCell = reference.getCell();
-                        mLocalScripts.add (script, item);
-                    }
-                }
-            }
+            addContainerScripts(reference, reference.getCell());
 
             if(mWorldScene->getActiveCells().find (reference.getCell()) != mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->addObjectToScene (reference);
         }
     }
+    
+    void World::removeContainerScripts(const Ptr& reference)
+    {
+        if( reference.getTypeName()==typeid (ESM::Container).name() ||
+            reference.getTypeName()==typeid (ESM::NPC).name() ||
+            reference.getTypeName()==typeid (ESM::Creature).name())
+        {
+            MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
+            for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
+            {
+                std::string script = MWWorld::Class::get(*it).getScript(*it);
+                if(script != "")
+                {
+                    MWWorld::Ptr item = *it;
+                    mLocalScripts.remove (item);
+                }
+            }
+        }
+    }
 
     void World::disable (const Ptr& reference)
     {
@@ -436,22 +459,9 @@ namespace MWWorld
         {
             reference.getRefData().disable();
             
-            /* remove scripts on container contents */
-            if( reference.getTypeName()==typeid (ESM::Container).name() ||
-                reference.getTypeName()==typeid (ESM::NPC).name() ||
-                reference.getTypeName()==typeid (ESM::Creature).name())
-            {
-                MWWorld::ContainerStore& container = MWWorld::Class::get(reference).getContainerStore(reference);
-                for(MWWorld::ContainerStoreIterator it = container.begin(); it != container.end(); ++it)
-                {
-                    std::string script = MWWorld::Class::get(*it).getScript(*it);
-                    if(script != "")
-                    {
-                        MWWorld::Ptr item = *it;
-                        mLocalScripts.remove (item);
-                    }
-                }
-            }
+            removeContainerScripts(reference);        
+            if(MWWorld::Class::get(reference).getScript(reference) != "")
+                mLocalScripts.remove(reference);
 
             if(mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->removeObjectFromScene (reference);
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 905e6fd96..fa5b41038 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -105,6 +105,9 @@ namespace MWWorld
             float getNpcActivationDistance ();
             float getObjectActivationDistance ();
 
+            void removeContainerScripts(const Ptr& reference);
+            void addContainerScripts(const Ptr& reference, Ptr::CellStore* cell);
+
         public:
 
             World (OEngine::Render::OgreRenderer& renderer,

From 951eb1b236b600ad6c35888649c79bbe8b59e5e8 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Wed, 16 Jan 2013 20:10:20 +0100
Subject: [PATCH 17/27] Dialogue: return a response from "Info Refusal" when
 disposition is not satisfied

---
 apps/openmw/mwdialogue/filter.cpp | 42 +++++++++++++++++++++++++------
 apps/openmw/mwdialogue/filter.hpp | 32 +++++++++++------------
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 99be5554a..d515c3ac4 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -121,6 +121,13 @@ bool MWDialogue::Filter::testSelectStructs (const ESM::DialInfo& info) const
     return true;
 }
 
+bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info) const
+{
+    int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor);
+
+    return actorDisposition >= info.mData.mDisposition;
+}
+
 bool MWDialogue::Filter::testSelectStruct (const SelectWrapper& select) const
 {
     if (select.isNpcOnly() && mActor.getTypeName()!=typeid (ESM::NPC).name())
@@ -547,17 +554,38 @@ MWDialogue::Filter::Filter (const MWWorld::Ptr& actor, int choice, bool talkedTo
 : mActor (actor), mChoice (choice), mTalkedToPlayer (talkedToPlayer)
 {}
 
-bool MWDialogue::Filter::operator() (const ESM::DialInfo& info) const
-{
-    return testActor (info) && testPlayer (info) && testSelectStructs (info);
-}
-
 const ESM::DialInfo *MWDialogue::Filter::search (const ESM::Dialogue& dialogue) const
 {
+    bool infoRefusal = false;
+
+    // Iterate over topic responses to find a matching one
     for (std::vector<ESM::DialInfo>::const_iterator iter = dialogue.mInfo.begin();
         iter!=dialogue.mInfo.end(); ++iter)
-        if ((*this) (*iter))
-            return &*iter;
+    {
+        if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter))
+        {
+            if (testDisposition (*iter))
+                return &*iter;
+            else
+                infoRefusal = true;
+        }
+    }
+
+    if (infoRefusal)
+    {
+        // No response is valid because of low NPC disposition,
+        // search a response in the topic "Info Refusal"
+
+        const MWWorld::Store<ESM::Dialogue> &dialogues =
+            MWBase::Environment::get().getWorld()->getStore().get<ESM::Dialogue>();
+
+        const ESM::Dialogue& infoRefusalDialogue = *dialogues.find ("Info Refusal");
+
+        for (std::vector<ESM::DialInfo>::const_iterator iter = infoRefusalDialogue.mInfo.begin();
+            iter!=infoRefusalDialogue.mInfo.end(); ++iter)
+            if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter) && testDisposition(*iter))
+                return &*iter;
+    }
 
     return 0;
 }
diff --git a/apps/openmw/mwdialogue/filter.hpp b/apps/openmw/mwdialogue/filter.hpp
index 7c8f1116f..aa8934bfc 100644
--- a/apps/openmw/mwdialogue/filter.hpp
+++ b/apps/openmw/mwdialogue/filter.hpp
@@ -18,39 +18,39 @@ namespace MWDialogue
             MWWorld::Ptr mActor;
             int mChoice;
             bool mTalkedToPlayer;
-    
+
             bool testActor (const ESM::DialInfo& info) const;
             ///< Is this the right actor for this \a info?
-    
+
             bool testPlayer (const ESM::DialInfo& info) const;
             ///< Do the player and the cell the player is currently in match \a info?
-    
+
             bool testSelectStructs (const ESM::DialInfo& info) const;
             ///< Are all select structs matching?
-    
+
+            bool testDisposition (const ESM::DialInfo& info) const;
+            ///< Is the actor disposition toward the player high enough?
+
             bool testSelectStruct (const SelectWrapper& select) const;
-    
+
             bool testSelectStructNumeric (const SelectWrapper& select) const;
-            
+
             int getSelectStructInteger (const SelectWrapper& select) const;
-            
+
             bool getSelectStructBoolean (const SelectWrapper& select) const;
-    
+
             int getFactionRank (const MWWorld::Ptr& actor, const std::string& factionId) const;
-            
+
             bool hasFactionRankSkillRequirements (const MWWorld::Ptr& actor, const std::string& factionId,
                 int rank) const;
 
             bool hasFactionRankReputationRequirements (const MWWorld::Ptr& actor, const std::string& factionId,
                 int rank) const;
-    
-        public:
-        
-            Filter (const MWWorld::Ptr& actor, int choice, bool talkedToPlayer);    
 
-            bool operator() (const ESM::DialInfo& info) const;    
-            ///< \return does the dialogue match?
-            
+        public:
+
+            Filter (const MWWorld::Ptr& actor, int choice, bool talkedToPlayer);
+
             const ESM::DialInfo *search (const ESM::Dialogue& dialogue) const;
     };
 }

From 05796d85a4e4d659ba4a0d61f5e7fa6be3dfacb3 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Sat, 19 Jan 2013 02:43:55 +0100
Subject: [PATCH 18/27] NPC: take stats from NPDT12 into account

Some available stats (level, reputation and disposition) were not used
for NPC with auto-calculated stats.
---
 apps/openmw/mwclass/npc.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 586f9638d..cfbc64b87 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -100,14 +100,15 @@ namespace MWClass
             }
             else
             {
-                /// \todo do something with mNpdt12 maybe:p
                 for (int i=0; i<8; ++i)
                     data->mCreatureStats.getAttribute (i).set (10);
 
                 for (int i=0; i<3; ++i)
                     data->mCreatureStats.setDynamic (i, 10);
 
-                data->mCreatureStats.setLevel (1);
+                data->mCreatureStats.setLevel(ref->mBase->mNpdt12.mLevel);
+                data->mNpcStats.setBaseDisposition(ref->mBase->mNpdt12.mDisposition);
+                data->mNpcStats.setReputation(ref->mBase->mNpdt12.mReputation);
             }
 
             data->mCreatureStats.setAiSetting (0, ref->mBase->mAiData.mHello);

From 43e85ea0c65301c28f83b053ca65847460815e72 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Sun, 20 Jan 2013 01:54:35 +0100
Subject: [PATCH 19/27] Disallow redirection to info refusal for greetings

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp |  9 +++++----
 apps/openmw/mwdialogue/filter.cpp             | 15 +++++++++++++--
 apps/openmw/mwdialogue/filter.hpp             |  7 ++++++-
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index a3bb640e6..a8e6a98c9 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -139,7 +139,8 @@ namespace MWDialogue
         {
             if(it->mType == ESM::Dialogue::Greeting)
             {
-                if (const ESM::DialInfo *info = filter.search (*it))
+                // Search a response (we do not accept a fallback to "Info refusal" here)
+                if (const ESM::DialInfo *info = filter.search (*it, false))
                 {
                     //initialise the GUI
                     MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue);
@@ -248,7 +249,7 @@ namespace MWDialogue
 
         const ESM::Dialogue& dialogue = *dialogues.find (topic);
 
-        if (const ESM::DialInfo *info = filter.search (dialogue))
+        if (const ESM::DialInfo *info = filter.search (dialogue, true))
         {
             parseText (info->mResponse);
 
@@ -295,7 +296,7 @@ namespace MWDialogue
         {
             if (iter->mType == ESM::Dialogue::Topic)
             {
-                if (filter.search (*iter))
+                if (filter.responseAvailable (*iter))
                 {
                     std::string lower = Misc::StringUtils::lowerCase(iter->mId);
                     mActorKnownTopics.push_back (lower);
@@ -412,7 +413,7 @@ namespace MWDialogue
                 {
                     Filter filter (mActor, mChoice, mTalkedTo);
 
-                    if (const ESM::DialInfo *info = filter.search (mDialogueMap[mLastTopic]))
+                    if (const ESM::DialInfo *info = filter.search (mDialogueMap[mLastTopic], true))
                     {
                         mChoiceMap.clear();
                         mChoice = -1;
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index d515c3ac4..5d56e94b0 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -554,7 +554,7 @@ MWDialogue::Filter::Filter (const MWWorld::Ptr& actor, int choice, bool talkedTo
 : mActor (actor), mChoice (choice), mTalkedToPlayer (talkedToPlayer)
 {}
 
-const ESM::DialInfo *MWDialogue::Filter::search (const ESM::Dialogue& dialogue) const
+const ESM::DialInfo *MWDialogue::Filter::search (const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const
 {
     bool infoRefusal = false;
 
@@ -571,7 +571,7 @@ const ESM::DialInfo *MWDialogue::Filter::search (const ESM::Dialogue& dialogue)
         }
     }
 
-    if (infoRefusal)
+    if (infoRefusal && fallbackToInfoRefusal)
     {
         // No response is valid because of low NPC disposition,
         // search a response in the topic "Info Refusal"
@@ -590,3 +590,14 @@ const ESM::DialInfo *MWDialogue::Filter::search (const ESM::Dialogue& dialogue)
     return 0;
 }
 
+bool MWDialogue::Filter::responseAvailable (const ESM::Dialogue& dialogue) const
+{
+    for (std::vector<ESM::DialInfo>::const_iterator iter = dialogue.mInfo.begin();
+        iter!=dialogue.mInfo.end(); ++iter)
+    {
+        if (testActor (*iter) && testPlayer (*iter) && testSelectStructs (*iter))
+            return true;
+    }
+
+    return false;
+}
diff --git a/apps/openmw/mwdialogue/filter.hpp b/apps/openmw/mwdialogue/filter.hpp
index aa8934bfc..707c0154b 100644
--- a/apps/openmw/mwdialogue/filter.hpp
+++ b/apps/openmw/mwdialogue/filter.hpp
@@ -51,7 +51,12 @@ namespace MWDialogue
 
             Filter (const MWWorld::Ptr& actor, int choice, bool talkedToPlayer);
 
-            const ESM::DialInfo *search (const ESM::Dialogue& dialogue) const;
+            const ESM::DialInfo *search (const ESM::Dialogue& dialogue, const bool fallbackToInfoRefusal) const;
+            ///< Get a matching response for the requested dialogue.
+            ///  Redirect to "Info Refusal" topic if a response fulfills all conditions but disposition.
+
+            bool responseAvailable (const ESM::Dialogue& dialogue) const;
+            ///< Does a matching response exist? (disposition is ignored for this check)
     };
 }
 

From 736e4716131238669105001cadd10f0308cc1a98 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Sun, 20 Jan 2013 15:57:34 +0100
Subject: [PATCH 20/27] Print a fallback text when no topic response is found

---
 apps/openmw/mwdialogue/dialoguemanagerimp.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index a8e6a98c9..f548c46f7 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -249,12 +249,12 @@ namespace MWDialogue
 
         const ESM::Dialogue& dialogue = *dialogues.find (topic);
 
+        MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
+
         if (const ESM::DialInfo *info = filter.search (dialogue, true))
         {
             parseText (info->mResponse);
 
-            MWGui::DialogueWindow* win = MWBase::Environment::get().getWindowManager()->getDialogueWindow();
-
             if (dialogue.mType==ESM::Dialogue::Persuasion)
             {
                 std::string modifiedTopic = "s" + topic;
@@ -278,6 +278,13 @@ namespace MWDialogue
             mLastTopic = topic;
             mLastDialogue = *info;
         }
+        else
+        {
+            // no response found, print a fallback text
+            win->addTitle (topic);
+            win->addText ("…");
+
+        }
     }
 
     void DialogueManager::updateTopics()

From af9e126487704ccf69090e7f4851e2ea8828d2f1 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Sat, 19 Jan 2013 22:53:41 +0100
Subject: [PATCH 21/27] =?UTF-8?q?Add=20unicode=20number=20for=20ellipsis?=
 =?UTF-8?q?=20(=E2=80=A6)=20to=20code=20range?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 files/mygui/openmw_font.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/mygui/openmw_font.xml b/files/mygui/openmw_font.xml
index 0383c9942..b1446fae1 100644
--- a/files/mygui/openmw_font.xml
+++ b/files/mygui/openmw_font.xml
@@ -11,6 +11,7 @@
             <Code range="33 126"/>
             <Code range="192 382"/> <!-- Central and Eastern European languages glyphs -->
             <Code range="1025 1105"/>
+            <Code range="2026"/> <!-- Ellipsis -->
             <Code range="8470"/>
             <Code range="8211"/>   <!-- Minus -->
             <Code range="8216 8217"/> <!-- Single quotes -->

From 31c71c029d9bfb662b1661c0422d6e325682ff1f Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Sun, 20 Jan 2013 17:01:30 +0000
Subject: [PATCH 22/27] objects with scripts attached, that are inside
 containers will behave correctly when the container is moved

---
 apps/openmw/mwworld/worldimp.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index ee18e5d95..46c58ecab 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -685,6 +685,7 @@ namespace MWWorld
             {
                 mWorldScene->removeObjectFromScene (ptr);
                 mLocalScripts.remove (ptr);
+                removeContainerScripts (ptr);
             }
         }
     }
@@ -698,6 +699,8 @@ namespace MWWorld
         CellStore *currCell = ptr.getCell();
         bool isPlayer = ptr == mPlayer->getPlayer();
         bool haveToMove = mWorldScene->isCellActive(*currCell) || isPlayer;
+        
+        removeContainerScripts(ptr);
 
         if (*currCell != newCell)
         {
@@ -725,6 +728,8 @@ namespace MWWorld
                     MWWorld::Ptr copy =
                         MWWorld::Class::get(ptr).copyToCell(ptr, newCell);
 
+                    addContainerScripts(copy, &newCell);
+
                     mRendering->moveObjectToCell(copy, vec, currCell);
 
                     if (MWWorld::Class::get(ptr).isActor())
@@ -1333,6 +1338,7 @@ namespace MWWorld
             if (!script.empty()) {
                 mLocalScripts.add(script, dropped);
             }
+            addContainerScripts(dropped, &cell);
         }
     }
 

From f5f3c2e62d167943cc4542e9400067c246137291 Mon Sep 17 00:00:00 2001
From: Tom Mason <wheybags@wheybags.com>
Date: Mon, 21 Jan 2013 20:06:08 +0000
Subject: [PATCH 23/27] enabling / disabling should not affect scripts

---
 apps/openmw/mwworld/worldimp.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 46c58ecab..24d139b37 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -427,8 +427,6 @@ namespace MWWorld
         {
             reference.getRefData().enable();
             
-            addContainerScripts(reference, reference.getCell());
-
             if(mWorldScene->getActiveCells().find (reference.getCell()) != mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->addObjectToScene (reference);
         }
@@ -459,10 +457,6 @@ namespace MWWorld
         {
             reference.getRefData().disable();
             
-            removeContainerScripts(reference);        
-            if(MWWorld::Class::get(reference).getScript(reference) != "")
-                mLocalScripts.remove(reference);
-
             if(mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end() && reference.getRefData().getCount())
                 mWorldScene->removeObjectFromScene (reference);
         }

From 90d05858efe026d1b08252303f9c6b3534eeaa06 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Tue, 22 Jan 2013 11:50:08 +0100
Subject: [PATCH 24/27] disabling dialogue sub-views for now

---
 apps/opencs/view/world/tablesubview.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index bb4bb76c6..f4deceb49 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -21,5 +21,6 @@ void CSVWorld::TableSubView::setEditLock (bool locked)
 
 void CSVWorld::TableSubView::rowActivated (const QModelIndex& index)
 {
-    focusId (mTable->getUniversalId (index.row()));
+    /// \todo re-enable, after dialogue sub views have been fixed up
+//    focusId (mTable->getUniversalId (index.row()));
 }
\ No newline at end of file

From cac68c9e87fe50eb8b28644ecfcead4c3ca3f548 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 23 Jan 2013 11:48:47 +0100
Subject: [PATCH 25/27] Removed an outdated section from CMakeLists

---
 CMakeLists.txt | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 208d348fb..2313d2d95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,35 +67,6 @@ endif()
 # We probably support older versions than this.
 cmake_minimum_required(VERSION 2.6)
 
-#
-# Pre-built binaries being used?
-#
-IF(EXISTS "${CMAKE_SOURCE_DIR}/prebuilt/vc100-mt-gd/ogre_1_7_1")
-    set(PREBUILT_DIR "${CMAKE_SOURCE_DIR}/prebuilt/vc100-mt-gd")
-    message (STATUS "OpenMW pre-built binaries found at ${PREBUILT_DIR}.")
-
-    SET(ENV{OGRE_HOME} "${PREBUILT_DIR}/ogre_1_7_1")
-
-    SET(ENV{BOOST_ROOT} "${PREBUILT_DIR}/boost_1_42_0")
-    set(Boost_USE_STATIC_LIBS   ON)
-    set(Boost_USE_MULTITHREADED ON)
-    set(ENV{BOOST_INCLUDEDIR} "${BOOST_ROOT}/include")
-    set(ENV{BOOST_LIBRARYDIR} "${BOOST_ROOT}/lib")
-
-    set(ENV{FREETYPE_DIR} "${PREBUILT_DIR}/freetype-2.3.5-1")
-
-    set(USE_MPG123 OFF)
-    set(USE_AUDIERE ON)
-    set(AUDIERE_INCLUDE_DIR "${PREBUILT_DIR}/audiere-1.9.4/include")
-    set(AUDIERE_LIBRARY "${PREBUILT_DIR}/audiere-1.9.4/lib/audiere.lib")
-
-    set(ENV{OPENALDIR} "${PREBUILT_DIR}/OpenAL 1.1 SDK")
-
-    set(BULLET_ROOT "${PREBUILT_DIR}/bullet")
-ELSE()
-    message (STATUS "OpenMW pre-built binaries not found.  Using standard locations.")
-ENDIF()
-
 # source directory: libs
 
 set(LIBDIR ${CMAKE_SOURCE_DIR}/libs)

From ed9a9904b431bb27ed9725e7c83023cf5fd11bab Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Thu, 24 Jan 2013 19:39:31 +0100
Subject: [PATCH 26/27] Dialogue filter: search script variables
 case-insensitively

---
 apps/openmw/mwdialogue/filter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 5d56e94b0..c1542515a 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -169,7 +169,7 @@ bool MWDialogue::Filter::testSelectStructNumeric (const SelectWrapper& select) c
             int i = 0;
 
             for (; i<static_cast<int> (script->mVarNames.size()); ++i)
-                if (script->mVarNames[i]==name)
+                if (Misc::StringUtils::lowerCase(script->mVarNames[i]) == name)
                     break;
 
             if (i>=static_cast<int> (script->mVarNames.size()))

From 19dff822f4f963fdab88d5f8f80c9b026edd6f91 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Thu, 24 Jan 2013 19:43:21 +0100
Subject: [PATCH 27/27] Dialogue: do not filter on disposition for creatures

---
 apps/openmw/mwdialogue/filter.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index c1542515a..09bb0ddc4 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -123,6 +123,11 @@ bool MWDialogue::Filter::testSelectStructs (const ESM::DialInfo& info) const
 
 bool MWDialogue::Filter::testDisposition (const ESM::DialInfo& info) const
 {
+    bool isCreature = (mActor.getTypeName() != typeid (ESM::NPC).name());
+
+    if (isCreature)
+        return true;
+
     int actorDisposition = MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mActor);
 
     return actorDisposition >= info.mData.mDisposition;