[Scummvm-git-logs] scummvm master -> 85faa4bebc43a9ac05dd1b5727a35d9cb22ff976
sev-
sev at scummvm.org
Fri Mar 3 22:03:45 CET 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
85faa4bebc DIRECTOR: Fix getNextLabelNumber() for the rightmost frame
Commit: 85faa4bebc43a9ac05dd1b5727a35d9cb22ff976
https://github.com/scummvm/scummvm/commit/85faa4bebc43a9ac05dd1b5727a35d9cb22ff976
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-03-03T22:02:58+01:00
Commit Message:
DIRECTOR: Fix getNextLabelNumber() for the rightmost frame
Changed paths:
engines/director/score.cpp
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 5bad616..0f2f9ec 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;
}
}
}
More information about the Scummvm-git-logs
mailing list