aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2017-03-03 22:02:58 +0100
committerEugene Sandulenko2017-03-03 22:02:58 +0100
commit85faa4bebc43a9ac05dd1b5727a35d9cb22ff976 (patch)
treef892bd7658a5305cd3b6ce4d73e38e9725f9f333 /engines
parentaafd10d3d1e807b21e064a2be65e85311ed9cc30 (diff)
downloadscummvm-rg350-85faa4bebc43a9ac05dd1b5727a35d9cb22ff976.tar.gz
scummvm-rg350-85faa4bebc43a9ac05dd1b5727a35d9cb22ff976.tar.bz2
scummvm-rg350-85faa4bebc43a9ac05dd1b5727a35d9cb22ff976.zip
DIRECTOR: Fix getNextLabelNumber() for the rightmost frame
Diffstat (limited to 'engines')
-rw-r--r--engines/director/score.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 5bad6160b7..0f2f9ecb96 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -717,14 +717,15 @@ int Score::getNextLabelNumber(int referenceFrame) {
for (i = _labels->begin(); i != _labels->end(); ++i) {
if ((*i)->number >= referenceFrame) {
+ int n = (*i)->number;
+ ++i;
if (i != _labels->end()) {
// return to the first marker to to the right
- ++i;
return (*i)->number;
} else {
// if no markers are to the right of the playback head,
// the playback head goes to the first marker to the left
- return (*i)->number;
+ return n;
}
}
}