diff options
| author | Colin Snover | 2016-07-09 12:41:12 -0500 |
|---|---|---|
| committer | Colin Snover | 2016-07-11 10:39:50 -0500 |
| commit | 4cfc3876026f15aa394dfa45809c4a340eef60f0 (patch) | |
| tree | ec318675dd04d86bf8bcbebc99df27c1933cddee /engines/sci/console.cpp | |
| parent | 7f53a26d9e8b55a865efea2f912189b01ca56258 (diff) | |
| download | scummvm-rg350-4cfc3876026f15aa394dfa45809c4a340eef60f0.tar.gz scummvm-rg350-4cfc3876026f15aa394dfa45809c4a340eef60f0.tar.bz2 scummvm-rg350-4cfc3876026f15aa394dfa45809c4a340eef60f0.zip | |
SCI32: Split GfxPalette and GfxPalette32 + HunkPalette
Diffstat (limited to 'engines/sci/console.cpp')
| -rw-r--r-- | engines/sci/console.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 2c74fe4b0c..6898745858 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -497,8 +497,10 @@ bool Console::cmdGetVersion(int argc, const char **argv) { if (getSciVersion() <= SCI_VERSION_1_1) { debugPrintf("kAnimate fastCast enabled: %s\n", g_sci->_gfxAnimate->isFastCastEnabled() ? "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"); + if (getSciVersion() < SCI_VERSION_2) { + 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"); @@ -1620,7 +1622,7 @@ bool Console::cmdParserNodes(int argc, const char **argv) { bool Console::cmdSetPalette(int argc, const char **argv) { if (argc < 2) { - debugPrintf("Sets a palette resource\n"); + debugPrintf("Sets a palette resource (SCI16)\n"); debugPrintf("Usage: %s <resourceId>\n", argv[0]); debugPrintf("where <resourceId> is the number of the palette resource to set\n"); return true; @@ -1628,6 +1630,13 @@ bool Console::cmdSetPalette(int argc, const char **argv) { uint16 resourceId = atoi(argv[1]); +#ifdef ENABLE_SCI32 + if (getSciVersion() >= SCI_VERSION_2) { + debugPrintf("This SCI version does not support this command\n"); + return true; + } +#endif + _engine->_gfxPalette16->kernelSetFromResource(resourceId, true); return true; } |