diff options
Diffstat (limited to 'engines/sherlock')
| -rw-r--r-- | engines/sherlock/image_file.cpp | 20 | ||||
| -rw-r--r-- | engines/sherlock/music.cpp | 4 | ||||
| -rw-r--r-- | engines/sherlock/objects.h | 2 | ||||
| -rw-r--r-- | engines/sherlock/tattoo/tattoo_people.cpp | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/sherlock/image_file.cpp b/engines/sherlock/image_file.cpp index c53e537bb8..112655648a 100644 --- a/engines/sherlock/image_file.cpp +++ b/engines/sherlock/image_file.cpp @@ -703,7 +703,7 @@ void ImageFile3DO::load3DOCelRoomData(Common::SeekableReadStream &stream) { error("load3DOCelRoomData: expected cel data, not enough bytes"); // read data into memory - byte *celDataPtr = new byte[celDataSize]; + byte *celDataPtr = new byte[celDataSize]; stream.read(celDataPtr, celDataSize); streamLeft -= celDataSize; @@ -936,15 +936,15 @@ void ImageFile3DO::loadFont(Common::SeekableReadStream &stream) { stream.read(bitsTablePtr, bitsTableSize); // Now extract all characters - uint16 curChar = 0; - const byte *curBitsLinePtr = bitsTablePtr; - const byte *curBitsPtr = NULL; - byte curBitsLeft = 0; - uint32 curCharHeightLeft = 0; - uint32 curCharWidthLeft = 0; - byte curBits = 0; - byte curBitsReversed = 0; - byte curPosX = 0; + uint16 curChar = 0; + const byte *curBitsLinePtr = bitsTablePtr; + const byte *curBitsPtr = NULL; + byte curBitsLeft = 0; + uint32 curCharHeightLeft = 0; + uint32 curCharWidthLeft = 0; + byte curBits = 0; + byte curBitsReversed = 0; + byte curPosX = 0; assert(bitsTableSize >= (header_maxChar * header_fontHeight * header_bytesPerLine)); // Security diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp index cef7157034..20b811ea98 100644 --- a/engines/sherlock/music.cpp +++ b/engines/sherlock/music.cpp @@ -182,8 +182,8 @@ bool MidiParser_SH::loadMusic(byte *musData, uint32 musDataSize) { _musData = musData; _musDataSize = musDataSize; - byte *headerPtr = _musData + 12; // skip over the already checked SPACE header - byte *pos = headerPtr; + byte *headerPtr = _musData + 12; // skip over the already checked SPACE header + byte *pos = headerPtr; uint16 headerSize = READ_LE_UINT16(headerPtr); assert(headerSize == 0x7F); // Security check diff --git a/engines/sherlock/objects.h b/engines/sherlock/objects.h index 25ccddedbb..6f1148e956 100644 --- a/engines/sherlock/objects.h +++ b/engines/sherlock/objects.h @@ -470,7 +470,7 @@ struct SceneImage { int _filesize; // File size SceneImage(); -} ; +}; } // End of namespace Sherlock diff --git a/engines/sherlock/tattoo/tattoo_people.cpp b/engines/sherlock/tattoo/tattoo_people.cpp index fc3c2e6574..458cc1a9c2 100644 --- a/engines/sherlock/tattoo/tattoo_people.cpp +++ b/engines/sherlock/tattoo/tattoo_people.cpp @@ -39,7 +39,7 @@ struct AdjustWalk { int _xAdjust; int _flipXAdjust; int _yAdjust; -} ; +}; static const AdjustWalk ADJUST_WALKS[NUM_ADJUSTED_WALKS] = { { "TUPRIGHT", -7, -19, 6 }, |