libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-06 10:58:01 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SHERLOCK: Fix some more GCC warnings

Browse Source
This commit is contained in:
Strangerke 2015-05-09 09:42:16 +02:00
parent 4c7e840388
commit 8d89bf9bc6
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/sherlock/journal.cpp
View File

@ -290,10 +290,10 @@ int Journal::loadJournalFile(bool alreadyLoaded) {
journalString += NAMES[talk._talkTo];
const byte *strP = replyP + 1;
char v;
byte v;
do {
v = *strP++;
} while (v && v < 128 && v != '.' && v != '!' && v != '?');
} while (v && (v < 128) && (v != '.') && (v != '!') && (v != '?'));
if (v == '?')
journalString += " asked, \"";

14
engines/sherlock/resources.cpp
View File

@ -343,9 +343,9 @@ void ImageFile::loadPalette(Common::SeekableReadStream &stream) {
int v2 = stream.readUint16LE() + 1;
stream.skip(1); // Skip paletteBase byte
bool rleEncoded = stream.readByte() == 1;
int size = v1 * v2;
int palSize = v1 * v2;
if ((size - 12) == PALETTE_SIZE && !rleEncoded) {
if ((palSize - 12) == PALETTE_SIZE && !rleEncoded) {
// Found palette, so read it in
stream.seek(2 + 12, SEEK_CUR);
for (int idx = 0; idx < PALETTE_SIZE; ++idx)
@ -373,21 +373,21 @@ void ImageFile::decompressFrame(ImageFrame &frame, const byte *src) {
// RLE encoded
byte *dst = (byte *)frame._frame.getPixels();
int size = frame._width * frame._height;
while (size > 0) {
int frameSize = frame._width * frame._height;
while (frameSize > 0) {
if (*src == frame._rleMarker) {
byte rleColor = src[1];
byte rleCount = src[2];
src += 3;
size -= rleCount;
frameSize -= rleCount;
while (rleCount--)
*dst++ = rleColor;
} else {
*dst++ = *src++;
--size;
--frameSize;
}
}
assert(size == 0);
assert(frameSize == 0);
} else {
// Uncompressed frame
Common::copy(src, src + frame._width * frame._height,

2
engines/sherlock/scalpel/scalpel.cpp
View File

@ -485,7 +485,7 @@ void ScalpelEngine::loadInventory() {
inv.push_back(InventoryItem(544, "Tarot", "Tarot Cards", "_ITEM71A"));
inv.push_back(InventoryItem(544, "Ornate Key", "An ornate key", "_ITEM70A"));
inv.push_back(InventoryItem(586, "Pawn ticket", "A pawn ticket", "_ITEM16A"));
};
}
/**
* Transition to show an image