aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/scene_lok.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/kyra/scene_lok.cpp')
-rw-r--r--engines/kyra/scene_lok.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp
index 345998e40e..fc1ca41189 100644
--- a/engines/kyra/scene_lok.cpp
+++ b/engines/kyra/scene_lok.cpp
@@ -406,7 +406,7 @@ void KyraEngine_LoK::startSceneScript(int brandonAlive) {
_screen->clearPage(3);
_res->exists(fileNameBuffer, true);
// FIXME: check this hack for amiga version
- _screen->loadBitmap(fileNameBuffer, 3, 3, (_flags.platform == Common::kPlatformAmiga ? _screen->getPalette(0) : 0));
+ _screen->loadBitmap(fileNameBuffer, 3, 3, (_flags.platform == Common::kPlatformAmiga ? &_screen->getPalette(0) : 0));
_sprites->loadSceneShapes();
_exitListPtr = 0;
@@ -770,7 +770,7 @@ void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
void KyraEngine_LoK::initSceneScreen(int brandonAlive) {
if (_flags.platform == Common::kPlatformAmiga) {
if (_unkScreenVar1 && !queryGameFlag(0xF0)) {
- memset(_screen->getPalette(2), 0, 32*3);
+ _screen->getPalette(2).clear();
if (_currentCharacter->sceneId != 117 || !queryGameFlag(0xB3))
_screen->setScreenPalette(_screen->getPalette(2));
}
@@ -782,10 +782,10 @@ void KyraEngine_LoK::initSceneScreen(int brandonAlive) {
if (_unkScreenVar1 && !queryGameFlag(0xA0)) {
if (_currentCharacter->sceneId == 45 && _paletteChanged)
- memcpy(_screen->getPalette(0) + 12*3, _screen->getPalette(4) + 12*3, 2);
+ _screen->getPalette(0).copy(_screen->getPalette(4), 12, 1);
if (_currentCharacter->sceneId >= 229 && _currentCharacter->sceneId <= 245 && (_brandonStatusBit & 1))
- memcpy(_screen->getPalette(0), _screen->getPalette(0) + 320*3, 64);
+ _screen->copyPalette(0, 10);
_screen->setScreenPalette(_screen->getPalette(0));
}
@@ -807,10 +807,10 @@ void KyraEngine_LoK::initSceneScreen(int brandonAlive) {
if (_unkScreenVar1 && _paletteChanged) {
if (!queryGameFlag(0xA0)) {
- memcpy(_screen->getPalette(0) + 684, _screen->getPalette(1) + 684, 60);
+ _screen->getPalette(0).copy(_screen->getPalette(1), 228, 20);
_screen->setScreenPalette(_screen->getPalette(0));
} else {
- memset(_screen->getPalette(0), 0, 768);
+ _screen->getPalette(0).clear();
}
}
}