Reduce difference with the master branch where possible.

apps/opencs/CMakeLists.txt

@@ -41,6 +41,7 @@ opencs_units (model/tools
 opencs_units_noqt (model/tools
     mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
     birthsigncheck spellcheck referencecheck referenceablecheck scriptcheck bodypartcheck
+    startscriptcheck
     )
 
 

apps/opencs/model/doc/document.cpp

@@ -2,7 +2,6 @@
 
 #include <cassert>
 #include <fstream>
-#include <iostream>
 
 #include <boost/filesystem.hpp>
 

apps/opencs/model/tools/startscriptcheck.cpp

@@ -0,0 +1,31 @@
+
+#include "startscriptcheck.hpp"
+
+#include <components/misc/stringops.hpp>
+
+CSMTools::StartScriptCheckStage::StartScriptCheckStage (
+    const CSMWorld::IdCollection<ESM::StartScript>& startScripts,
+    const CSMWorld::IdCollection<ESM::Script>& scripts)
+: mStartScripts (startScripts), mScripts (scripts)
+{}
+
+void CSMTools::StartScriptCheckStage::perform(int stage, CSMDoc::Messages& messages)
+{
+    const CSMWorld::Record<ESM::StartScript>& record = mStartScripts.getRecord (stage);
+
+    if (record.isDeleted())
+        return;
+
+    std::string scriptId = record.get().mId;
+
+    CSMWorld::UniversalId id (CSMWorld::UniversalId::Type_StartScript, scriptId);
+
+    if (mScripts.searchId (Misc::StringUtils::lowerCase (scriptId))==-1)
+        messages.push_back (
+            std::make_pair (id, "Start script " + scriptId + " does not exist"));
+}
+
+int CSMTools::StartScriptCheckStage::setup()
+{
+    return mStartScripts.getSize();
+}

apps/opencs/model/tools/startscriptcheck.hpp

@@ -0,0 +1,28 @@
+#ifndef CSM_TOOLS_STARTSCRIPTCHECK_H
+#define CSM_TOOLS_STARTSCRIPTCHECK_H
+
+#include <components/esm/loadsscr.hpp>
+#include <components/esm/loadscpt.hpp>
+
+#include "../doc/stage.hpp"
+
+#include "../world/idcollection.hpp"
+
+namespace CSMTools
+{
+    class StartScriptCheckStage : public CSMDoc::Stage
+    {
+            const CSMWorld::IdCollection<ESM::StartScript>& mStartScripts;
+            const CSMWorld::IdCollection<ESM::Script>& mScripts;
+
+        public:
+
+            StartScriptCheckStage (const CSMWorld::IdCollection<ESM::StartScript>& startScripts,
+                const CSMWorld::IdCollection<ESM::Script>& scripts);
+
+            virtual void perform(int stage, CSMDoc::Messages& messages);
+            virtual int setup();
+    };
+}
+
+#endif

apps/opencs/model/tools/tools.cpp

@@ -24,6 +24,7 @@
 #include "scriptcheck.hpp"
 #include "bodypartcheck.hpp"
 #include "referencecheck.hpp"
+#include "startscriptcheck.hpp"
 
 CSMDoc::Operation *CSMTools::Tools::get (int type)
 {
@@ -84,6 +85,8 @@ CSMDoc::Operation *CSMTools::Tools::getVerifier()
 
         mVerifier->appendStage (new ScriptCheckStage (mDocument));
 
+        mVerifier->appendStage (new StartScriptCheckStage (mData.getStartScripts(), mData.getScripts()));
+
         mVerifier->appendStage(
             new BodyPartCheckStage(
                 mData.getBodyParts(),

apps/opencs/model/world/collection.hpp

@@ -2,13 +2,11 @@
 #define CSM_WOLRD_COLLECTION_H
 
 #include <vector>
-#include <iostream>
 #include <map>
 #include <algorithm>
 #include <cctype>
 #include <stdexcept>
 #include <functional>
-#include <cassert>
 
 #include <QVariant>
 

apps/opencs/model/world/collectionbase.cpp

@@ -2,7 +2,6 @@
 #include "collectionbase.hpp"
 
 #include <stdexcept>
-#include <cassert>
 
 #include "columnbase.hpp"
 

apps/opencs/model/world/columnimp.hpp

@@ -6,7 +6,6 @@
 #include <stdexcept>
 
 #include <boost/lexical_cast.hpp>
-#include <iostream>
 
 #include <QColor>
 

apps/opencs/view/world/enumdelegate.cpp

@@ -46,6 +46,7 @@ QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent,
                                               const QModelIndex& index) const
 {
     return createEditor(parent, option, index, CSMWorld::ColumnBase::Display_None);
+    //overloading virtual functions is HARD
 }
 
 QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem& option,

apps/openmw/mwmechanics/activespells.cpp

@@ -185,7 +185,7 @@ namespace MWMechanics
             bool missing = true;
             for (std::vector<ActiveEffect>::const_iterator iter(addTo.begin()); iter != addTo.end(); ++iter)
             {
-                if (effect->mEffectId == iter->mEffectId)
+                if ((effect->mEffectId == iter->mEffectId) && (effect->mArg == iter->mArg))
                 {
                     missing = false;
                     break;

apps/openmw/mwscript/transformationextensions.cpp

@@ -316,6 +316,7 @@ namespace MWScript
                         store = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
                         if(!cell)
                         {
+                            runtime.getContext().report ("unknown cell (" + cellID + ")");
                             std::cerr << "unknown cell (" << cellID << ")\n";
                         }
                     }
@@ -428,6 +429,7 @@ namespace MWScript
                         store = MWBase::Environment::get().getWorld()->getExterior(cx,cy);
                         if(!cell)
                         {
+                            runtime.getContext().report ("unknown cell (" + cellID + ")");
                             std::cerr << "unknown cell (" << cellID << ")\n";
                         }
                     }

components/contentselector/view/contentselector.cpp

@@ -183,6 +183,7 @@ void ContentSelectorView::ContentSelector::setGameFileSelected(int index, bool s
 
 void ContentSelectorView::ContentSelector::slotAddonTableItemActivated(const QModelIndex &index)
 {
+    // toggles check state when an AddOn file is double clicked or activated by keyboard
     QModelIndex sourceIndex = mAddonProxyModel->mapToSource (index);
 
     if (!mContentModel->isEnabled (sourceIndex))