diff options
| author | Johannes Schickel | 2007-03-07 20:31:19 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2007-03-07 20:31:19 +0000 |
| commit | 305a1525edd5b8c0841806f8e6d023bca5a2a85e (patch) | |
| tree | 935bce7ea012c9fde0a0f71244b9f1e896cdc913 /engines/kyra/sprites.cpp | |
| parent | 71cc080fc5c7cf972a6c191cdd29aaf44a223bbb (diff) | |
| download | scummvm-rg350-305a1525edd5b8c0841806f8e6d023bca5a2a85e.tar.gz scummvm-rg350-305a1525edd5b8c0841806f8e6d023bca5a2a85e.tar.bz2 scummvm-rg350-305a1525edd5b8c0841806f8e6d023bca5a2a85e.zip | |
- cleanup
- some diffs for Amiga version
svn-id: r26010
Diffstat (limited to 'engines/kyra/sprites.cpp')
| -rw-r--r-- | engines/kyra/sprites.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |