[Scummvm-cvs-logs] scummvm master -> 1a58262ca72fd09748755463299e54749d5c63ae
athrxx
athrxx at scummvm.org
Thu Jun 16 21:35:36 CEST 2011
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:
1a58262ca7 SCUMM: fix bug in cb661d63d0cd45d1231435a593b74dfc51872a0f
Commit: 1a58262ca72fd09748755463299e54749d5c63ae
https://github.com/scummvm/scummvm/commit/1a58262ca72fd09748755463299e54749d5c63ae
Author: athrxx (athrxx at scummvm.org)
Date: 2011-06-16T12:32:33-07:00
Commit Message:
SCUMM: fix bug in cb661d63d0cd45d1231435a593b74dfc51872a0f
Changed paths:
engines/scumm/scumm.cpp
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 1ccf215..362430d 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1164,8 +1164,10 @@ Common::Error ScummEngine::init() {
} else {
Common::List<Graphics::PixelFormat> tryModes = _system->getSupportedFormats();
for (Common::List<Graphics::PixelFormat>::iterator g = tryModes.begin(); g != tryModes.end(); ++g) {
- if (g->bytesPerPixel != 2 || g->aBits())
+ if (g->bytesPerPixel != 2 || g->aBits()) {
g = tryModes.erase(g);
+ g--;
+ }
if (*g == _outputPixelFormat) {
tryModes.clear();
More information about the Scummvm-git-logs
mailing list