aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/scumm.cpp
diff options
context:
space:
mode:
authorTravis Howell2009-10-26 09:11:18 +0000
committerTravis Howell2009-10-26 09:11:18 +0000
commitea91714b173a625e9b68f92168eb45953931d19f (patch)
tree500ef5213db5add64490c37c1849229d154d5632 /engines/scumm/scumm.cpp
parent7bec12bbec0190890425d173e48339c9de3813a5 (diff)
downloadscummvm-rg350-ea91714b173a625e9b68f92168eb45953931d19f.tar.gz
scummvm-rg350-ea91714b173a625e9b68f92168eb45953931d19f.tar.bz2
scummvm-rg350-ea91714b173a625e9b68f92168eb45953931d19f.zip
Switch PCE version of Loom to 16bit color, since it used 9bit color.
svn-id: r45393
Diffstat (limited to 'engines/scumm/scumm.cpp')
-rw-r--r--engines/scumm/scumm.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index b8afb5460e..7cfa813f70 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -111,12 +111,12 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
_currentScript(0xFF), // Let debug() work on init stage
_messageDialog(0), _pauseDialog(0), _scummMenuDialog(0), _versionDialog(0) {
- if (_game.features & GF_16BIT_COLOR) {
- _gdi = new Gdi16Bit(this);
- } else if (_game.platform == Common::kPlatformNES) {
+ if (_game.platform == Common::kPlatformNES) {
_gdi = new GdiNES(this);
} else if (_game.platform == Common::kPlatformPCEngine) {
_gdi = new GdiPCEngine(this);
+ } else if (_game.features & GF_16BIT_COLOR) {
+ _gdi = new Gdi16Bit(this);
} else if (_game.version <= 1) {
_gdi = new GdiV1(this);
} else if (_game.version == 2) {
@@ -1486,6 +1486,9 @@ void ScummEngine_v2::resetScumm() {
void ScummEngine_v3::resetScumm() {
ScummEngine_v4::resetScumm();
+ _16BitPalette = (uint16 *)malloc(512);
+ memset(_16BitPalette, 0, 512);
+
delete _savePreparedSavegame;
_savePreparedSavegame = NULL;
}