diff options
| author | Filippos Karapetis | 2010-07-22 08:57:25 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-07-22 08:57:25 +0000 |
| commit | 093800dc1cfa795ed0b58a0e9be99479f42d2d5e (patch) | |
| tree | 6182e17c53e52c6579ef1f1c064933d9e61a5ba7 | |
| parent | e20288fd4f61f7cc0f5c22af4c4762f8fd277dbe (diff) | |
| download | scummvm-rg350-093800dc1cfa795ed0b58a0e9be99479f42d2d5e.tar.gz scummvm-rg350-093800dc1cfa795ed0b58a0e9be99479f42d2d5e.tar.bz2 scummvm-rg350-093800dc1cfa795ed0b58a0e9be99479f42d2d5e.zip | |
Silenced a known warning in SQ5, after the intro
svn-id: r51131
| -rw-r--r-- | engines/sci/graphics/palette.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp index c1654b4612..2eebd57976 100644 --- a/engines/sci/graphics/palette.cpp +++ b/engines/sci/graphics/palette.cpp @@ -106,7 +106,12 @@ void GfxPalette::createFromData(byte *data, int bytesLeft, Palette *paletteOut) if (bytesLeft < 37) { // This happens when loading palette of picture 0 in sq5 - the resource is broken and doesn't contain a full // palette - warning("GfxPalette::createFromData() - not enough bytes in resource, expected palette header"); + + if (g_sci->getGameId() == GID_SQ5 && g_sci->getEngineState()->currentRoomNumber() == 110 && bytesLeft == 28) { + // Known case for SQ5, which doesn't affect gameplay, thus don't throw a warning + } else { + warning("GfxPalette::createFromData() - not enough bytes in resource, expected palette header"); + } return; } // palette formats in here are not really version exclusive, we can not use sci-version to differentiate between them |