diff options
| author | Willem Jan Palenstijn | 2011-11-01 23:56:51 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-11-01 23:56:51 +0100 |
| commit | 0af011ba82a9213362fddb73941d9a28e1d1caae (patch) | |
| tree | 062b02e3e311ad5d2096f38dc072ed7f999768eb | |
| parent | 9dcab12160525bd1fa2ea9054ab5430bf151c386 (diff) | |
| download | scummvm-rg350-0af011ba82a9213362fddb73941d9a28e1d1caae.tar.gz scummvm-rg350-0af011ba82a9213362fddb73941d9a28e1d1caae.tar.bz2 scummvm-rg350-0af011ba82a9213362fddb73941d9a28e1d1caae.zip | |
SCUMM: Further clean up loop
| -rw-r--r-- | engines/scumm/scumm.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 78effaffec..f94496b14b 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1169,15 +1169,13 @@ 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(); ) { + for (Common::List<Graphics::PixelFormat>::iterator g = tryModes.begin(); g != tryModes.end(); ++g) { if (g->bytesPerPixel != 2 || g->aBits()) { - g = tryModes.erase(g); + g = tryModes.reverse_erase(g); } else if (*g == _outputPixelFormat) { tryModes.clear(); tryModes.push_back(_outputPixelFormat); break; - } else { - ++g; } } |