aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2011-11-01 15:54:15 +0100
committerWillem Jan Palenstijn2011-11-01 15:54:15 +0100
commitf191413b1c48caf7cebf3bd5ac5256a0bb9b5d67 (patch)
treeec1b4aa599f33ac03c76a0ccdbe04ea3f383e953 /engines/scumm
parent47bc08a429ce03bf811dd63c45bd05cd76828dd7 (diff)
downloadscummvm-rg350-f191413b1c48caf7cebf3bd5ac5256a0bb9b5d67.tar.gz
scummvm-rg350-f191413b1c48caf7cebf3bd5ac5256a0bb9b5d67.tar.bz2
scummvm-rg350-f191413b1c48caf7cebf3bd5ac5256a0bb9b5d67.zip
SCUMM: Clean up loop
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/scumm.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 81f6af453c..78effaffec 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1169,16 +1169,15 @@ Common::Error ScummEngine::init() {
return Common::kUnsupportedColorMode;
} else {
Common::List<Graphics::PixelFormat> tryModes = _system->getSupportedFormats();
- for (Common::List<Graphics::PixelFormat>::iterator g = tryModes.begin(); g != tryModes.end(); ++g) {
+ for (Common::List<Graphics::PixelFormat>::iterator g = tryModes.begin(); g != tryModes.end(); ) {
if (g->bytesPerPixel != 2 || g->aBits()) {
g = tryModes.erase(g);
- g--;
- }
-
- if (*g == _outputPixelFormat) {
+ } else if (*g == _outputPixelFormat) {
tryModes.clear();
tryModes.push_back(_outputPixelFormat);
break;
+ } else {
+ ++g;
}
}