mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-22 03:40:49 +00:00
Code Issues Projects Releases Wiki Activity

Use sayDone() only for scripting backward compatibility

Browse Source
This commit is contained in:
Andrei Kortunov 2019-09-06 09:19:41 +04:00
parent c9deb1b325
commit d58f93f388
6 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwbase/soundmanager.hpp
View File

@ -100,9 +100,12 @@ namespace MWBase
///< Say some text, without an actor ref ///< Say some text, without an actor ref
/// \param filename name of a sound file in "Sound/" in the data directory. /// \param filename name of a sound file in "Sound/" in the data directory.
virtual bool sayDone(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const = 0; virtual bool sayActive(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const = 0;
///< Is actor not speaking? ///< Is actor not speaking?
virtual bool sayDone(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const = 0;
///< For scripting backward compatibility
virtual void stopSay(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) = 0; virtual void stopSay(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) = 0;
///< Stop an actor speaking ///< Stop an actor speaking

2
apps/openmw/mwdialogue/dialoguemanagerimp.cpp
View File

@ -540,7 +540,7 @@ namespace MWDialogue
void DialogueManager::say(const MWWorld::Ptr &actor, const std::string &topic) void DialogueManager::say(const MWWorld::Ptr &actor, const std::string &topic)
{ {
MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager(); MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
if(!sndMgr->sayDone(actor)) if(sndMgr->sayActive(actor))
{ {
// Actor is already saying something. // Actor is already saying something.
return; return;

2
apps/openmw/mwmechanics/actors.cpp
View File

@ -372,7 +372,7 @@ namespace MWMechanics
void Actors::playIdleDialogue(const MWWorld::Ptr& actor) void Actors::playIdleDialogue(const MWWorld::Ptr& actor)
{ {
if (!actor.getClass().isActor() || actor == getPlayer() || !MWBase::Environment::get().getSoundManager()->sayDone(actor)) if (!actor.getClass().isActor() || actor == getPlayer() || MWBase::Environment::get().getSoundManager()->sayActive(actor))
return; return;
const CreatureStats &stats = actor.getClass().getCreatureStats(actor); const CreatureStats &stats = actor.getClass().getCreatureStats(actor);

2
apps/openmw/mwrender/npcanimation.cpp
View File

@ -184,7 +184,7 @@ void HeadAnimationTime::update(float dt)
if (!mEnabled) if (!mEnabled)
return; return;
if (MWBase::Environment::get().getSoundManager()->sayDone(mReference)) if (!MWBase::Environment::get().getSoundManager()->sayActive(mReference))
{ {
mBlinkTimer += dt; mBlinkTimer += dt;

21
apps/openmw/mwsound/soundmanagerimp.cpp
View File

@ -566,6 +566,27 @@ namespace MWSound
return true; return true;
} }
bool SoundManager::sayActive(const MWWorld::ConstPtr &ptr) const
{
SaySoundMap::const_iterator snditer = mSaySoundsQueue.find(ptr);
if(snditer != mSaySoundsQueue.end())
{
if(mOutput->isStreamPlaying(snditer->second))
return true;
return false;
}
snditer = mActiveSaySounds.find(ptr);
if(snditer != mActiveSaySounds.end())
{
if(mOutput->isStreamPlaying(snditer->second))
return true;
return false;
}
return false;
}
void SoundManager::stopSay(const MWWorld::ConstPtr &ptr) void SoundManager::stopSay(const MWWorld::ConstPtr &ptr)
{ {
SaySoundMap::iterator snditer = mSaySoundsQueue.find(ptr); SaySoundMap::iterator snditer = mSaySoundsQueue.find(ptr);

5
apps/openmw/mwsound/soundmanagerimp.hpp
View File

@ -179,9 +179,12 @@ namespace MWSound
///< Say some text, without an actor ref ///< Say some text, without an actor ref
/// \param filename name of a sound file in "Sound/" in the data directory. /// \param filename name of a sound file in "Sound/" in the data directory.
virtual bool sayDone(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const; virtual bool sayActive(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const;
///< Is actor not speaking? ///< Is actor not speaking?
virtual bool sayDone(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()) const;
///< For scripting backward compatibility
virtual void stopSay(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr()); virtual void stopSay(const MWWorld::ConstPtr &reference=MWWorld::ConstPtr());
///< Stop an actor speaking ///< Stop an actor speaking