Merge pull request #1462 from kcat/master

Minor animation fixes

apps/openmw/mwbase/soundmanager.hpp

@@ -82,9 +82,6 @@ namespace MWBase
             ///< Play a soundifle
             /// \param filename name of a sound file in "Music/" in the data directory.
 
-            virtual void startRandomTitle() = 0;
-            ///< Starts a random track from the current playlist
-
             virtual bool isMusicPlaying() = 0;
             ///< Returns true if music is playing
 

apps/openmw/mwmechanics/character.cpp

@@ -2025,12 +2025,8 @@ void CharacterController::unpersistAnimationState()
 bool CharacterController::playGroup(const std::string &groupname, int mode, int count, bool persist)
 {
     if(!mAnimation || !mAnimation->hasAnimation(groupname))
-    {
-        std::cerr<< "Animation "<<groupname<<" not found for " << mPtr.getCellRef().getRefId() << std::endl;
         return false;
-    }
+
-    else
-    {
     // If this animation is a looped animation (has a "loop start" key) that is already playing
     // and has not yet reached the end of the loop, allow it to continue animating with its existing loop count
     // and remove any other animations that were queued.
@@ -2077,7 +2073,6 @@ bool CharacterController::playGroup(const std::string &groupname, int mode, int
         mAnimQueue.resize(1);
         mAnimQueue.push_back(entry);
     }
-    }
     return true;
 }
 

apps/openmw/mwrender/animation.cpp

@@ -757,8 +757,6 @@ namespace MWRender
                 break;
             }
         }
-        if(iter == mAnimSources.rend())
-            std::cerr<< "Failed to find animation "<<groupname<<" for "<<mPtr.getCellRef().getRefId() <<std::endl;
 
         resetActiveGroups();
     }
@@ -795,7 +793,7 @@ namespace MWRender
               // We have to ignore extra garbage at the end.
               // 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->second.size() < stoptag.size() || stopkey->second.compare(0,stoptag.size(), stoptag) != 0))
             ++stopkey;
         if(stopkey == keys.rend())
             return false;

apps/openmw/mwsound/soundmanagerimp.cpp

@@ -391,11 +391,6 @@ namespace MWSound
         mMusic->setFadeout(0.5f);
     }
 
-    void SoundManager::streamMusic(const std::string& filename)
-    {
-        advanceMusic("Music/"+filename);
-    }
-
     void SoundManager::startRandomTitle()
     {
         std::vector<std::string> filelist;
@@ -446,6 +441,12 @@ namespace MWSound
         tracklist.pop_back();
     }
 
+
+    void SoundManager::streamMusic(const std::string& filename)
+    {
+        advanceMusic("Music/"+filename);
+    }
+
     bool SoundManager::isMusicPlaying()
     {
         return mMusic && mOutput->isStreamPlaying(mMusic);

apps/openmw/mwsound/soundmanagerimp.hpp

@@ -127,6 +127,7 @@ namespace MWSound
 
         void streamMusicFull(const std::string& filename);
         void advanceMusic(const std::string& filename);
+        void startRandomTitle();
 
         void updateSounds(float duration);
         void updateRegionSound(float duration);
@@ -157,9 +158,6 @@ namespace MWSound
         ///< Play a soundifle
         /// \param filename name of a sound file in "Music/" in the data directory.
 
-        virtual void startRandomTitle();
-        ///< Starts a random track from the current playlist
-
         virtual bool isMusicPlaying();
         ///< Returns true if music is playing
 

components/resource/scenemanager.hpp

@@ -141,11 +141,11 @@ namespace Resource
         void setUnRefImageDataAfterApply(bool unref);
 
         /// @see ResourceManager::updateCache
-        virtual void updateCache(double referenceTime);
+        void updateCache(double referenceTime) override;
 
-        virtual void clearCache();
+        void clearCache() override;
 
-        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) const;
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
 
     private:
 

components/terrain/chunkmanager.hpp

@@ -32,9 +32,9 @@ namespace Terrain
 
         osg::ref_ptr<osg::Node> getChunk(float size, const osg::Vec2f& center, int lod, unsigned int lodFlags);
 
-        virtual void reportStats(unsigned int frameNumber, osg::Stats* stats) const;
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
 
-        virtual void clearCache();
+        void clearCache() override;
 
         void releaseGLObjects(osg::State* state) override;