diff options
| author | Paul Gilbert | 2012-10-10 22:33:44 +1100 |
|---|---|---|
| committer | Paul Gilbert | 2012-10-10 22:33:44 +1100 |
| commit | d0487f5d9f8cc481ac6a8d1e1752fbb112cdffc6 (patch) | |
| tree | 3ac42b1130d4e11fe492b6387288288a1ed4aca5 /engines | |
| parent | 971f51ce01ea7afcb43c9eef3a7941449319cd63 (diff) | |
| download | scummvm-rg350-d0487f5d9f8cc481ac6a8d1e1752fbb112cdffc6.tar.gz scummvm-rg350-d0487f5d9f8cc481ac6a8d1e1752fbb112cdffc6.tar.bz2 scummvm-rg350-d0487f5d9f8cc481ac6a8d1e1752fbb112cdffc6.zip | |
HOPKINS: Bugfix to not call core setPalette in 16-bit mode
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/hopkins/graphics.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp index 04c43c966b..0761c45149 100644 --- a/engines/hopkins/graphics.cpp +++ b/engines/hopkins/graphics.cpp @@ -1011,7 +1011,9 @@ void GraphicsManager::SETCOLOR4(int palIndex, int r, int g, int b) { cmap[v8 + 2] = bv; WRITE_LE_UINT16(&SD_PIXELS[2 * palIndex], MapRGB(rv, gv, bv)); - g_system->getPaletteManager()->setPalette(cmap, palIndex, 1); + + if (Winbpp == 1) + g_system->getPaletteManager()->setPalette(cmap, palIndex, 1); } void GraphicsManager::CHANGE_PALETTE(const byte *palette) { @@ -2343,7 +2345,7 @@ void GraphicsManager::OPTI_INI(const Common::String &file, int a2) { v13 = file + ".ini"; ptr = _vm->_fileManager.RECHERCHE_CAT(v13, 1); - if (g_PTRNUL == ptr) { + if (ptr == g_PTRNUL) { _vm->_fileManager.CONSTRUIT_FICHIER(_vm->_globals.HOPLINK, v13); ptr = _vm->_fileManager.CHARGE_FICHIER(_vm->_globals.NFICHIER); } |