From 305a1525edd5b8c0841806f8e6d023bca5a2a85e Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Wed, 7 Mar 2007 20:31:19 +0000 Subject: - cleanup - some diffs for Amiga version svn-id: r26010 --- engines/kyra/sprites.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/kyra/sprites.cpp') diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp index 5fa86b5a42..ba1e08ede1 100644 --- a/engines/kyra/sprites.cpp +++ b/engines/kyra/sprites.cpp @@ -422,7 +422,7 @@ void Sprites::loadDAT(const char *filename, SceneExits &exits) { } // XXX _engine->_paletteChanged = 1; - memcpy(_screen->getPalette(1) + 684, _dat + 0x17, 60); + _screen->loadPalette(_dat + 0x17, _screen->getPalette(1) + 684, 60); uint8 *data = _dat + 0x6B; uint16 length = READ_LE_UINT16(data); @@ -478,7 +478,7 @@ void Sprites::loadDAT(const char *filename, SceneExits &exits) { data += 2; break; default: - warning("Unknown code in DAT file '%s' offset %d: %x", filename, data - _dat, READ_LE_UINT16(data)); + warning("Unknown code in DAT file '%s' offset %d: %x", filename, int(data - _dat), READ_LE_UINT16(data)); data += 2; break; } -- cgit v1.2.3