aboutsummaryrefslogtreecommitdiff
path: root/engines/xeen/resources.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2014-12-26 13:10:30 +1100
committerPaul Gilbert2014-12-26 13:10:30 +1100
commit1249bc03fdbf6d1bc390f9aea45b482cbb258e33 (patch)
tree50818636b4b4f3722355afb997c1aab6262539a1 /engines/xeen/resources.cpp
parent42afa00392372b68013a871e90857dc151ae7c2f (diff)
downloadscummvm-rg350-1249bc03fdbf6d1bc390f9aea45b482cbb258e33.tar.gz
scummvm-rg350-1249bc03fdbf6d1bc390f9aea45b482cbb258e33.tar.bz2
scummvm-rg350-1249bc03fdbf6d1bc390f9aea45b482cbb258e33.zip
XEEN: Implemented horizontal and vertical page merging
Diffstat (limited to 'engines/xeen/resources.cpp')
-rw-r--r--engines/xeen/resources.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/xeen/resources.cpp b/engines/xeen/resources.cpp
index 3a1994da4e..b005d7431d 100644
--- a/engines/xeen/resources.cpp
+++ b/engines/xeen/resources.cpp
@@ -280,7 +280,7 @@ void SpriteResource::decodeFrame(File &f, uint16 offset, XSurface &s) {
// Get cell header
f.seek(offset);
int xOffset = f.readUint16LE();
- int width = f.readUint16LE();
+ f.skip(2);
int yOffset = f.readUint16LE();
int height = f.readUint16LE();
@@ -288,7 +288,7 @@ void SpriteResource::decodeFrame(File &f, uint16 offset, XSurface &s) {
const int patternSteps[] = { 0, 1, 1, 1, 2, 2, 3, 3, 0, -1, -1, -1, -2, -2, -3, -3 };
// Main loop
- int byteCount, opr1, opr2;
+ int opr1, opr2;
int32 pos;
for (int yPos = yOffset, byteCount = 0; yPos < height + yOffset; yPos++, byteCount = 0) {
// The number of bytes in this scan line
@@ -298,7 +298,7 @@ void SpriteResource::decodeFrame(File &f, uint16 offset, XSurface &s) {
// Skip the specified number of scan lines
yPos += f.readByte();
} else {
- // Skip the transparent color at the beginning of the scan line
+ // Skip the transparent pixels at the beginning of the scan line
int xPos = f.readByte() + xOffset; ++byteCount;
byte *destP = (byte *)s.getBasePtr(xPos, yPos);