diff options
| author | Norbert Lange | 2009-07-01 14:45:24 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-07-01 14:45:24 +0000 |
| commit | abef70f4e14f495b20097cb46411d1fafbafdd53 (patch) | |
| tree | 27462f82f352b303ac059dd275466930c88b2de6 /engines/kyra/kyra_lok.cpp | |
| parent | 3b94e2488df9a699a899727515ac69af6a0a1a6e (diff) | |
| parent | f9298ff40310149779b37ccdecc873afba7adf2f (diff) | |
| download | scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.tar.gz scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.tar.bz2 scummvm-rg350-abef70f4e14f495b20097cb46411d1fafbafdd53.zip | |
Merging in changes from trunk
svn-id: r41989
Diffstat (limited to 'engines/kyra/kyra_lok.cpp')
| -rw-r--r-- | engines/kyra/kyra_lok.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index fcd35e7282..e5ca52abcc 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -157,7 +157,10 @@ KyraEngine_LoK::~KyraEngine_LoK() { } Common::Error KyraEngine_LoK::init() { - _screen = new Screen_LoK(this, _system); + if (_flags.platform == Common::kPlatformPC98 && _flags.useHiResOverlay && ConfMan.getBool("16_color")) + _screen = new Screen_LoK_16(this, _system); + else + _screen = new Screen_LoK(this, _system); assert(_screen); _screen->setResolution(); @@ -358,7 +361,7 @@ void KyraEngine_LoK::startup() { loadButtonShapes(); initMainButtonList(); loadMainScreen(); - _screen->loadPalette("PALETTE.COL", _screen->_currentPalette); + _screen->loadPalette("PALETTE.COL", _screen->getPalette(0)); // XXX _animator->initAnimStateList(); @@ -906,6 +909,9 @@ void KyraEngine_LoK::registerDefaultSettings() { // Most settings already have sensible defaults. This one, however, is // specific to the Kyra engine. ConfMan.registerDefault("walkspeed", 2); + + if (_flags.platform == Common::kPlatformPC98 && _flags.useHiResOverlay) + ConfMan.registerDefault("16_color", false); } void KyraEngine_LoK::readSettings() { |