mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 10:06:42 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-12-05 15:41:20 +01:00
commit 03a0b1fbfd
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwsound/soundmanagerimp.cpp
View file

@ -612,7 +612,8 @@ namespace MWSound
void SoundManager::stopSound(MWBase::SoundPtr sound) void SoundManager::stopSound(MWBase::SoundPtr sound)
{ {
mOutput->stopSound(sound); if (sound.get())
mOutput->stopSound(sound);
} }
void SoundManager::stopSound3D(const MWWorld::Ptr &ptr, const std::string& soundId) void SoundManager::stopSound3D(const MWWorld::Ptr &ptr, const std::string& soundId)

1
apps/openmw/mwsound/soundmanagerimp.hpp
View file

@ -201,6 +201,7 @@ namespace MWSound
virtual void stopSound(MWBase::SoundPtr sound); virtual void stopSound(MWBase::SoundPtr sound);
///< Stop the given sound from playing ///< Stop the given sound from playing
/// @note no-op if \a sound is null
virtual void stopSound3D(const MWWorld::Ptr &reference, const std::string& soundId); virtual void stopSound3D(const MWWorld::Ptr &reference, const std::string& soundId);
///< Stop the given object from playing the given sound, ///< Stop the given object from playing the given sound,

6
components/sceneutil/skeleton.cpp
View file

@ -3,6 +3,8 @@
#include <osg/Transform> #include <osg/Transform>
#include <osg/MatrixTransform> #include <osg/MatrixTransform>
#include <components/misc/stringops.hpp>
#include <iostream> #include <iostream>
namespace SceneUtil namespace SceneUtil
@ -23,7 +25,7 @@ public:
if (!bone) if (!bone)
return; return;
mCache[bone->getName()] = std::make_pair(getNodePath(), bone); mCache[Misc::StringUtils::lowerCase(bone->getName())] = std::make_pair(getNodePath(), bone);
traverse(node); traverse(node);
} }
@ -59,7 +61,7 @@ Bone* Skeleton::getBone(const std::string &name)
mBoneCacheInit = true; mBoneCacheInit = true;
} }
BoneCache::iterator found = mBoneCache.find(name); BoneCache::iterator found = mBoneCache.find(Misc::StringUtils::lowerCase(name));
if (found == mBoneCache.end()) if (found == mBoneCache.end())
return NULL; return NULL;