libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-09 11:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #991 from Akz-/emi-stopchore-fix

Browse Source 
EMI: Ignore fade times longer than 0.6 seconds in StopChore. Fixes #988
This commit is contained in:
Joel Teichroeb 2014-08-03 07:41:45 -07:00
commit 3168f06f43
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,6 +345,13 @@ void Lua_V2::StopChore() {
fadeTime = lua_getnumber(fadeTimeObj);
}
// There are a few cases in the scripts where StopChore is called with an excessively
// large fadeTime value. The original engine ignores fade times greater or equal
// to 0.6 seconds, so we replicate that behavior here.
if (fadeTime >= 0.6f) {
fadeTime = 0.0f;
}
Chore *c = EMIChore::getPool().getObject(chore);
if (c) {
c->stop((int)(fadeTime * 1000));