Merge remote-tracking branch 'scrawl/openmw-31' into openmw-31

apps/openmw/mwgui/companionwindow.cpp

@@ -153,6 +153,11 @@ void CompanionWindow::onReferenceUnavailable()
     MWBase::Environment::get().getWindowManager()->removeGuiMode(GM_Companion);
 }
 
+void CompanionWindow::resetReference()
+{
+    ReferenceInterface::resetReference();
+    mItemView->setModel(NULL);
+}
 
 
 }

apps/openmw/mwgui/companionwindow.hpp

@@ -20,6 +20,8 @@ namespace MWGui
 
         virtual void exit();
 
+        virtual void resetReference();
+
         void open(const MWWorld::Ptr& npc);
         void onFrame ();
 

apps/openmw/mwgui/container.cpp

@@ -258,6 +258,12 @@ namespace MWGui
             onTakeAllButtonClicked(mTakeButton);
     }
 
+    void ContainerWindow::resetReference()
+    {
+        ReferenceInterface::resetReference();
+        mItemView->setModel(NULL);
+    }
+
     void ContainerWindow::close()
     {
         WindowBase::close();

apps/openmw/mwgui/container.hpp

@@ -54,6 +54,8 @@ namespace MWGui
         void open(const MWWorld::Ptr& container, bool loot=false);
         virtual void close();
 
+        virtual void resetReference();
+
         virtual void exit();
 
     private:

apps/openmw/mwgui/tradewindow.cpp

@@ -531,4 +531,10 @@ namespace MWGui
             sellerStats.setLastRestockTime(MWBase::Environment::get().getWorld()->getTimeStamp());
         }
     }
+
+    void TradeWindow::resetReference()
+    {
+        ReferenceInterface::resetReference();
+        mItemView->setModel(NULL);
+    }
 }

apps/openmw/mwgui/tradewindow.hpp

@@ -37,6 +37,7 @@ namespace MWGui
 
             virtual void exit();
 
+            virtual void resetReference();
 
         private:
             ItemView* mItemView;

apps/openmw/mwmechanics/character.cpp

@@ -570,10 +570,14 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
         if (cls.hasInventoryStore(mPtr))
         {
             getActiveWeapon(cls.getCreatureStats(mPtr), cls.getInventoryStore(mPtr), &mWeaponType);
-            if(mWeaponType != WeapType_None && mWeaponType != WeapType_Spell && mWeaponType != WeapType_HandToHand)
+            if (mWeaponType != WeapType_None)
             {
-                getWeaponGroup(mWeaponType, mCurrentWeapon);
                 mUpperBodyState = UpperCharState_WeapEquiped;
+                getWeaponGroup(mWeaponType, mCurrentWeapon);
+            }
+
+            if(mWeaponType != WeapType_None && mWeaponType != WeapType_Spell && mWeaponType != WeapType_HandToHand)
+            {
                 mAnimation->showWeapons(true);
                 mAnimation->setWeaponGroup(mCurrentWeapon);
             }

apps/openmw/mwrender/camera.cpp

@@ -149,6 +149,8 @@ namespace MWRender
             mViewModeToggleQueued = true;
             return;
         }
+        else
+            mViewModeToggleQueued = false;
 
         mFirstPersonView = !mFirstPersonView;
         processViewChange();

apps/openmw/mwrender/videoplayer.cpp

@@ -1088,7 +1088,7 @@ public:
 
     void close() { }
 
-    bool update(Ogre::MaterialPtr &mat, Ogre::Rectangle2D *rect, int screen_width, int screen_height)
+    bool update()
     { return false; }
 };