[Scummvm-cvs-logs] scummvm master -> 6a8fadeec83822b100c4eaaa511eabb285dd4765
eriktorbjorn
eriktorbjorn at telia.com
Sun Mar 6 18:40:26 CET 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:
6a8fadeec8 SCI: Silence GCC warning
Commit: 6a8fadeec83822b100c4eaaa511eabb285dd4765
https://github.com/scummvm/scummvm/commit/6a8fadeec83822b100c4eaaa511eabb285dd4765
Author: eriktorbjorn (eriktorbjorn at users.sourceforge.net)
Date: 2011-03-06T09:39:26-08:00
Commit Message:
SCI: Silence GCC warning
Changed paths:
engines/sci/graphics/picture.cpp
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index dbc3a88..6a3767a 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -713,7 +713,7 @@ void GfxPicture::drawVectorData(byte *data, int dataSize) {
break;
case PIC_OPX_VGA_SET_PALETTE:
if (_resMan->getViewType() == kViewAmiga ||
- _resMan->getViewType() == kViewVga && g_sci->getPlatform() == Common::kPlatformAmiga // Longbow Amiga
+ (_resMan->getViewType() == kViewVga && g_sci->getPlatform() == Common::kPlatformAmiga) // Longbow Amiga
) {
if ((data[curPos] == 0x00) && (data[curPos + 1] == 0x01) && ((data[curPos + 32] & 0xF0) != 0xF0)) {
// Left-Over VGA palette, we simply ignore it
More information about the Scummvm-git-logs
mailing list