diff options
| author | Max Horn | 2005-03-25 00:56:03 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-25 00:56:03 +0000 |
| commit | 7ed1c19f6c46d46cd0fae4a505887675e8338e49 (patch) | |
| tree | c81b4c7b54931126882a82a7d4094ac4c6b9e0d8 /scumm/scumm.cpp | |
| parent | 88cf4e3c293a228d9778fa5ecda61c33f9b07613 (diff) | |
| download | scummvm-rg350-7ed1c19f6c46d46cd0fae4a505887675e8338e49.tar.gz scummvm-rg350-7ed1c19f6c46d46cd0fae4a505887675e8338e49.tar.bz2 scummvm-rg350-7ed1c19f6c46d46cd0fae4a505887675e8338e49.zip | |
Cleanup: collect the C64 specific render data into a struct inside class Gdi
svn-id: r17224
Diffstat (limited to 'scumm/scumm.cpp')
| -rw-r--r-- | scumm/scumm.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp index b64594d029..f96a3e9ac6 100644 --- a/scumm/scumm.cpp +++ b/scumm/scumm.cpp @@ -2307,14 +2307,14 @@ void ScummEngine::initRoomSubBlocks() { } else { _IM00_offs = 0; for (i = 0; i < 4; i++){ - gdi._C64Colors[i] = roomptr[6 + i]; + gdi._C64.colors[i] = roomptr[6 + i]; } - gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 10), gdi._C64CharMap, 2048); - gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 12), gdi._C64PicMap, roomptr[4] * roomptr[5]); - gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 14), gdi._C64ColorMap, roomptr[4] * roomptr[5]); - gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 16), gdi._C64MaskMap, roomptr[4] * roomptr[5]); - gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 18) + 2, gdi._C64MaskChar, READ_LE_UINT16(roomptr + READ_LE_UINT16(roomptr + 18))); - gdi._C64ObjectMode = true; + gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 10), gdi._C64.charMap, 2048); + gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 12), gdi._C64.picMap, roomptr[4] * roomptr[5]); + gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 14), gdi._C64.colorMap, roomptr[4] * roomptr[5]); + gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 16), gdi._C64.maskMap, roomptr[4] * roomptr[5]); + gdi.decodeC64Gfx(roomptr + READ_LE_UINT16(roomptr + 18) + 2, gdi._C64.maskChar, READ_LE_UINT16(roomptr + READ_LE_UINT16(roomptr + 18))); + gdi._objectMode = true; } } else if (_features & GF_OLD_BUNDLE) { _IM00_offs = READ_LE_UINT16(roomptr + 0x0A); |