Merge branch 'master' into next

apps/openmw/mwdialogue/dialoguemanager.cpp

@@ -677,7 +677,6 @@ namespace MWDialogue
 
     void DialogueManager::executeScript(std::string script)
     {
-        std::cout << script;
         std::vector<Interpreter::Type_Code> code;
         if(compile(script,code))
         {

apps/openmw/mwrender/npcanimation.cpp

@@ -159,7 +159,6 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, OEngine::Render::OgreRendere
             insert->scale(race->data.height.female, race->data.height.female, race->data.height.female);
         else
             insert->scale(race->data.height.male, race->data.height.male, race->data.height.male);
-		std::cout << "Inv" << inv.getStateId() << "\n";
         updateParts();
 
 }

apps/openmw/mwworld/inventorystore.cpp

@@ -8,8 +8,6 @@
 
 #include "class.hpp"
 
-#include <iostream> /// \todo remove after rendering is implemented
-
 void MWWorld::InventoryStore::copySlots (const InventoryStore& store)
 {
     // some const-trickery, required because of a flaw in the handling of MW-references and the
@@ -168,13 +166,5 @@ void MWWorld::InventoryStore::autoEquip (const MWMechanics::NpcStats& stats)
     {
         mSlots.swap (slots);
         flagAsModified();
-
-        /// \todo remove the following line after rendering is implemented
-        for (std::size_t i=0; i<mSlots.size(); ++i)
-            if (mSlots[i]!=end())
-            {
-                std::cout<<"NPC is equipping " << MWWorld::Class::get (*mSlots[i]).getName (*mSlots[i])
-                    << " in slot " << i << std::endl;
-            }
     }
 }