diff options
| author | Alyssa Milburn | 2011-07-07 09:24:10 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-07-07 09:24:10 +0200 |
| commit | 66e81d633f987310f12038147ae01b8ce4f640f7 (patch) | |
| tree | 6035a7124789c3e6cdff5f603e9933529b7efdc7 /engines/sword2/render.cpp | |
| parent | affaa1f4d6cf5f27f654029133b1aec7b9eca4b5 (diff) | |
| parent | 72da8ef5adf82d8a65da299207f30af5058ca8a9 (diff) | |
| download | scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.tar.gz scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.tar.bz2 scummvm-rg350-66e81d633f987310f12038147ae01b8ce4f640f7.zip | |
Merge remote-tracking branch 'origin/master' into soltys_wip2
Diffstat (limited to 'engines/sword2/render.cpp')
| -rw-r--r-- | engines/sword2/render.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp index 1e068d6061..8bf9d922d5 100644 --- a/engines/sword2/render.cpp +++ b/engines/sword2/render.cpp @@ -699,8 +699,6 @@ int32 Screen::initializePsxBackgroundLayer(byte *parallax) { */ int32 Screen::initializePsxParallaxLayer(byte *parallax) { - uint16 plxXres, plxYres; - uint16 xTiles, yTiles; uint16 i, j, k; byte *data; byte *dst; @@ -714,10 +712,10 @@ int32 Screen::initializePsxParallaxLayer(byte *parallax) { return RD_OK; } - plxXres = READ_LE_UINT16(parallax); - plxYres = READ_LE_UINT16(parallax + 2); - xTiles = READ_LE_UINT16(parallax + 4); - yTiles = READ_LE_UINT16(parallax + 6); + // uint16 plxXres = READ_LE_UINT16(parallax); + // uint16 plxYres = READ_LE_UINT16(parallax + 2); + uint16 xTiles = READ_LE_UINT16(parallax + 4); + uint16 yTiles = READ_LE_UINT16(parallax + 6); // Beginning of parallax table composed by uint32, // if word is 0, corresponding tile contains no data and must be skipped, |