diff options
| author | Andrei Prykhodko | 2019-01-15 23:11:00 +0200 |
|---|---|---|
| committer | Andrei Prykhodko | 2019-01-15 23:11:00 +0200 |
| commit | 07b4495e2b184496be4c24c9cfe041b4717df03e (patch) | |
| tree | c5af0369a8e370397c43be8ed88674036ac20378 | |
| parent | d10cfaff6bb0253dfdf2bec311c0a9ffd4fe341e (diff) | |
| download | scummvm-rg350-07b4495e2b184496be4c24c9cfe041b4717df03e.tar.gz scummvm-rg350-07b4495e2b184496be4c24c9cfe041b4717df03e.tar.bz2 scummvm-rg350-07b4495e2b184496be4c24c9cfe041b4717df03e.zip | |
PINK: fixed ActionPlay behavior when startFrame is wrong
This fixes Trac bug #10800
| -rw-r--r-- | engines/pink/objects/actions/action_play.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/pink/objects/actions/action_play.cpp b/engines/pink/objects/actions/action_play.cpp index 9551f13424..b7b171d52e 100644 --- a/engines/pink/objects/actions/action_play.cpp +++ b/engines/pink/objects/actions/action_play.cpp @@ -65,8 +65,10 @@ void ActionPlay::onStart() { if (_stopFrame == -1 || _stopFrame >= frameCount) _stopFrame = frameCount - 1; - if (_startFrame >= _decoder.getFrameCount()) - _startFrame = 0; + if (_startFrame >= _decoder.getFrameCount()) { + _actor->endAction(); + return; + } ActionCEL::setFrame(_startFrame); // doesn't need to decode startFrame here. Update method will decode |