diff options
| author | Colin Snover | 2016-01-06 20:00:28 -0600 |
|---|---|---|
| committer | Colin Snover | 2016-01-07 16:35:09 -0600 |
| commit | aeee621e4413fe71ffada6c4bc096ae2a5a8c204 (patch) | |
| tree | 41817ee3e96fcc279988bb5e604553694e2737ba /engines/sci/console.cpp | |
| parent | 453afd7bbc7b83506638bf87b830384078f729e1 (diff) | |
| download | scummvm-rg350-aeee621e4413fe71ffada6c4bc096ae2a5a8c204.tar.gz scummvm-rg350-aeee621e4413fe71ffada6c4bc096ae2a5a8c204.tar.bz2 scummvm-rg350-aeee621e4413fe71ffada6c4bc096ae2a5a8c204.zip | |
SCI32: Add initial support for palette cycling (kPalCycle) and fading (kPalFade)
Graphics palette code was rewritten between SCI1 and SCI2, so
SCI32 palette engine code has been moved to a separate GfxPalette32
class.
Diffstat (limited to 'engines/sci/console.cpp')
| -rw-r--r-- | engines/sci/console.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 5cd7b9f7ca..438c725324 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -487,8 +487,8 @@ bool Console::cmdGetVersion(int argc, const char **argv) { debugPrintf("SCI2.1 kernel table: %s\n", (_engine->_features->detectSci21KernelType() == SCI_VERSION_2) ? "modified SCI2 (old)" : "SCI2.1 (new)"); #endif debugPrintf("View type: %s\n", viewTypeDesc[g_sci->getResMan()->getViewType()]); - debugPrintf("Uses palette merging: %s\n", g_sci->_gfxPalette->isMerging() ? "yes" : "no"); - debugPrintf("Uses 16 bit color matching: %s\n", g_sci->_gfxPalette->isUsing16bitColorMatch() ? "yes" : "no"); + debugPrintf("Uses palette merging: %s\n", g_sci->_gfxPalette16->isMerging() ? "yes" : "no"); + debugPrintf("Uses 16 bit color matching: %s\n", g_sci->_gfxPalette16->isUsing16bitColorMatch() ? "yes" : "no"); debugPrintf("Resource volume version: %s\n", g_sci->getResMan()->getVolVersionDesc()); debugPrintf("Resource map version: %s\n", g_sci->getResMan()->getMapVersionDesc()); debugPrintf("Contains selector vocabulary (vocab.997): %s\n", hasVocab997 ? "yes" : "no"); @@ -1618,7 +1618,7 @@ bool Console::cmdSetPalette(int argc, const char **argv) { uint16 resourceId = atoi(argv[1]); - _engine->_gfxPalette->kernelSetFromResource(resourceId, true); + _engine->_gfxPalette16->kernelSetFromResource(resourceId, true); return true; } |