libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-11 13:45:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: RT: Don't run secondary scripts if an anim is active

Browse Source
This commit is contained in:
Paul Gilbert 2015-07-05 23:48:59 -04:00
parent ef492b351b
commit c98d5f0d2d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/sherlock/talk.cpp
View File

@ -29,6 +29,7 @@
#include "sherlock/scalpel/scalpel_user_interface.h"
#include "sherlock/tattoo/tattoo.h"
#include "sherlock/tattoo/tattoo_people.h"
#include "sherlock/tattoo/tattoo_scene.h"
#include "sherlock/tattoo/tattoo_talk.h"
namespace Sherlock {
@ -150,7 +151,11 @@ void Talk::talkTo(const Common::String &filename) {
// If there any canimations currently running, or a portrait is being cleared,
// save the filename for later executing when the canimation is done
if (scene._canimShapes.size() > 0 || people._clearingThePortrait) {
bool ongoingAnim = scene._canimShapes.size() > 0;
if (IS_ROSE_TATTOO) {
ongoingAnim = static_cast<Tattoo::TattooScene *>(_vm->_scene)->_activeCAnim.active();
}
if (ongoingAnim || people._clearingThePortrait) {
// Make sure we're not in the middle of a script
if (!_scriptMoreFlag) {
_scriptName = filename;