diff options
| author | Nicola Mettifogo | 2007-03-03 10:01:43 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-03-03 10:01:43 +0000 |
| commit | c15310920a8a8899289366c12873cda7c2f80989 (patch) | |
| tree | 2c4f14d1dbda5a1a52eaf204f9b3ded417d9f678 | |
| parent | 1dce0b18d9c6d8eb62621cb22a7a8f60a5070175 (diff) | |
| download | scummvm-rg350-c15310920a8a8899289366c12873cda7c2f80989.tar.gz scummvm-rg350-c15310920a8a8899289366c12873cda7c2f80989.tar.bz2 scummvm-rg350-c15310920a8a8899289366c12873cda7c2f80989.zip | |
loadBackground simplified: palette cycling is still broken, though
svn-id: r25948
| -rw-r--r-- | engines/parallaction/graphics.cpp | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp index bab53c34e5..4f942a380f 100644 --- a/engines/parallaction/graphics.cpp +++ b/engines/parallaction/graphics.cpp @@ -1164,29 +1164,18 @@ void Graphics::loadBackground(const char *filename, Graphics::Buffers buffer) { if (!_vm->_archive.openArchivedFile(filename)) errorFileNotFound(filename); -// byte palette[PALETTE_SIZE]; - byte v150[4]; _vm->_archive.read(_palette, PALETTE_SIZE); - _vm->_archive.read(&v150, 4); - - byte tempfx[sizeof(PaletteFxRange)*6]; - _vm->_archive.read(&tempfx, sizeof(PaletteFxRange)*6); - -// setPalette(palette); uint16 _si; - for (_si = 0; _si < 4; _si++) { - byte _al = v150[_si]; - _bgLayers[_si] = _al; - } + for (_si = 0; _si < 4; _si++) + _bgLayers[_si] = _vm->_archive.readByte(); - Common::MemoryReadStream sread(tempfx, sizeof(PaletteFxRange)*6); for (_si = 0; _si < 6; _si++) { - _palettefx[_si]._timer = sread.readUint16BE(); - _palettefx[_si]._step = sread.readUint16BE(); - _palettefx[_si]._flags = sread.readUint16BE(); - _palettefx[_si]._first = sread.readByte(); - _palettefx[_si]._last = sread.readByte(); + _palettefx[_si]._timer = _vm->_archive.readUint16BE(); + _palettefx[_si]._step = _vm->_archive.readUint16BE(); + _palettefx[_si]._flags = _vm->_archive.readUint16BE(); + _palettefx[_si]._first = _vm->_archive.readByte(); + _palettefx[_si]._last = _vm->_archive.readByte(); } #if 0 |