diff options
| -rw-r--r-- | engines/sherlock/graphics.h | 2 | ||||
| -rw-r--r-- | engines/sherlock/people.h | 10 | ||||
| -rw-r--r-- | engines/sherlock/resources.cpp | 28 | ||||
| -rw-r--r-- | engines/sherlock/scalpel/scalpel.cpp | 2 | ||||
| -rw-r--r-- | engines/sherlock/scene.h | 4 |
5 files changed, 23 insertions, 23 deletions
diff --git a/engines/sherlock/graphics.h b/engines/sherlock/graphics.h index 91a65c8c43..d4a1584968 100644 --- a/engines/sherlock/graphics.h +++ b/engines/sherlock/graphics.h @@ -37,7 +37,7 @@ private: protected: virtual void addDirtyRect(const Common::Rect &r) {} public: - Surface(uint16 width, uint16 height); + Surface(uint16 width, uint16 height); Surface(); virtual ~Surface(); diff --git a/engines/sherlock/people.h b/engines/sherlock/people.h index ee16fab243..f98c3db867 100644 --- a/engines/sherlock/people.h +++ b/engines/sherlock/people.h @@ -32,11 +32,11 @@ namespace Sherlock { // People definitions enum PeopleId { - PLAYER = 0, - AL = 0, - PEG = 1, - NUM_OF_PEOPLE = 2, // Holmes and Watson - MAX_PEOPLE = 66 // Total of all NPCs + PLAYER = 0, + AL = 0, + PEG = 1, + NUM_OF_PEOPLE = 2, // Holmes and Watson + MAX_PEOPLE = 66 // Total of all NPCs }; // Animation sequence identifiers for characters diff --git a/engines/sherlock/resources.cpp b/engines/sherlock/resources.cpp index 3f74590386..f50f780195 100644 --- a/engines/sherlock/resources.cpp +++ b/engines/sherlock/resources.cpp @@ -294,7 +294,7 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool loadPalette(stream); int streamSize = stream.size(); - while (stream.pos() < streamSize) { + while (stream.pos() < streamSize) { ImageFrame frame; frame._width = stream.readUint16LE() + 1; frame._height = stream.readUint16LE() + 1; @@ -309,30 +309,30 @@ void ImageFile::load(Common::SeekableReadStream &stream, bool skipPalette, bool frame._rleEncoded = stream.readByte() == 1; frame._offset.x = stream.readByte(); } - frame._offset.y = stream.readByte(); + frame._offset.y = stream.readByte(); frame._rleEncoded = !skipPalette && frame._rleEncoded; if (frame._paletteBase) { // Nibble packed frame data frame._size = (frame._width * frame._height) / 2; } else if (frame._rleEncoded) { - // this size includes the header size, which we subtract + // This size includes the header size, which we subtract frame._size = stream.readUint16LE() - 11; frame._rleMarker = stream.readByte(); - } else { + } else { // Uncompressed data frame._size = frame._width * frame._height; - } + } // Load data for frame and decompress it byte *data = new byte[frame._size]; stream.read(data, frame._size); - decompressFrame(frame, data); + decompressFrame(frame, data); delete[] data; push_back(frame); - } + } } /** @@ -372,17 +372,17 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) { } } else if (frame._rleEncoded) { // RLE encoded - byte *dst = (byte *)frame._frame.getPixels(); + byte *dst = (byte *)frame._frame.getPixels(); int frameSize = frame._width * frame._height; while (frameSize > 0) { if (*src == frame._rleMarker) { - byte rleColor = src[1]; - byte rleCount = src[2]; - src += 3; - frameSize -= rleCount; - while (rleCount--) - *dst++ = rleColor; + byte rleColor = src[1]; + byte rleCount = src[2]; + src += 3; + frameSize -= rleCount; + while (rleCount--) + *dst++ = rleColor; } else { *dst++ = *src++; --frameSize; diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index 5d84a7f5ed..6959e435d2 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -81,7 +81,7 @@ const int MAP_TRANSLATE[NUM_PLACES] = { }; const byte MAP_SEQUENCES[3][MAX_FRAME] = { - { 1, 1, 2, 3, 4, 0 }, // Overview Still + { 1, 1, 2, 3, 4, 0 }, // Overview Still { 5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0 }, { 5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 0 } }; diff --git a/engines/sherlock/scene.h b/engines/sherlock/scene.h index 8ef5d74785..96714c4a3a 100644 --- a/engines/sherlock/scene.h +++ b/engines/sherlock/scene.h @@ -33,8 +33,8 @@ namespace Sherlock { #define SCENES_COUNT 63 -#define MAX_ZONES 40 -#define INFO_LINE 140 +#define MAX_ZONES 40 +#define INFO_LINE 140 class SherlockEngine; |