libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-24 05:01:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #984 from Akz-/emi-chore-fix

Browse Source 
EMI: Return false in IsChorePlaying if the chore is paused. Fixes #983
This commit is contained in:
Joel Teichroeb 2014-08-02 12:03:28 -07:00
commit 8eccef7579
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/grim/costume/chore.h
View File

@ -60,6 +60,7 @@ public:
void setPaused(bool paused);
bool isPlaying() { return _playing; }
bool isPaused() { return _paused; }
bool isLooping() { return _looping; }
void advance(uint msecs);

2
engines/grim/emi/lua_v2_actor.cpp
View File

@ -268,7 +268,7 @@ void Lua_V2::IsChorePlaying() {
Chore *c = EMIChore::getPool().getObject(chore);
if (c) {
pushbool(c->isPlaying());
pushbool(c->isPlaying() && !c->isPaused());
} else {
lua_pushnil();
}