thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCUMM: Fix warnings

Browse source
This commit is contained in:
AndywinXp 2022-07-05 10:04:43 +02:00 • committed by Lothar Serra Mari
parent e78c671b45
commit f0d371d96e
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/scumm/cursor.cpp
View file

@ -208,7 +208,7 @@ void ScummEngine_v7::setDefaultCursor() {
white = getPaletteColorFromRGB(palette, inverseRgbIdx, inverseRgbIdx, inverseRgbIdx); white = getPaletteColorFromRGB(palette, inverseRgbIdx, inverseRgbIdx, inverseRgbIdx);
} while (white == 1 && rgbIdx != 100); } while (white == 1 && rgbIdx != 100);
for (int i = 0; i < sizeof(default_v8_cursor); ++i) { for (int i = 0; i < ARRAYSIZE(default_v8_cursor); i++) {
cursorPixel = default_v8_cursor[i]; cursorPixel = default_v8_cursor[i];
if (isSmushActive() && cursorPixel == 0x0F) if (isSmushActive() && cursorPixel == 0x0F)

4
engines/scumm/gfx_gui.cpp
View file

@ -320,7 +320,7 @@ int ScummEngine_v7::getInternalGUIControlFromCoordinates(int x, int y) {
_internalGUIControls[id].yPos < y) { _internalGUIControls[id].yPos < y) {
id++; id++;
if (id >= sizeof(_internalGUIControls)) if (id >= ARRAYSIZE(_internalGUIControls))
return -1; return -1;
} }
return id; return id;
@ -453,7 +453,7 @@ void ScummEngine_v7::confirmExitDialog() {
(ks.keycode == Common::KEYCODE_c && ks.hasFlags(Common::KBD_CTRL))); (ks.keycode == Common::KEYCODE_c && ks.hasFlags(Common::KBD_CTRL)));
ctrlId = getInternalGUIControlFromCoordinates(_mouse.x, _mouse.y); ctrlId = getInternalGUIControlFromCoordinates(_mouse.x, _mouse.y);
if (leftBtnPressed && ctrlId == 0 || (toupper(ks.ascii) == yesLabelPtr[0])) if ((leftBtnPressed && ctrlId == 0) || (toupper(ks.ascii) == yesLabelPtr[0]))
quitGame(); quitGame();
// Restore the previous cursor... // Restore the previous cursor...

4
engines/scumm/palette.cpp
View file

@ -1559,9 +1559,9 @@ uint32 ScummEngine::findClosestPaletteColor(byte *palette, int numOfSlots, byte
blueSquareDiff = (b - palette[2]) * (b - palette[2]); blueSquareDiff = (b - palette[2]) * (b - palette[2]);
weightedColorError = 3 * redSquareDiff + 5 * greenSquareDiff + 2 * blueSquareDiff; weightedColorError = 3 * redSquareDiff + 5 * greenSquareDiff + 2 * blueSquareDiff;
if (3 * redSquareDiff + 5 * greenSquareDiff + 2 * blueSquareDiff < minErr) { if (weightedColorError < minErr) {
color = i; color = i;
minErr = 3 * redSquareDiff + 5 * greenSquareDiff + 2 * blueSquareDiff; minErr = weightedColorError;
} }
palette += 3; palette += 3;
} }

2
engines/scumm/saveload.cpp
View file

@ -165,7 +165,6 @@ void ScummEngine::copyHeapSaveGameToFile(int slot, const char *saveName) {
Common::String fileName; Common::String fileName;
SaveGameHeader hdr; SaveGameHeader hdr;
bool saveFailed = false; bool saveFailed = false;
uint32 heapFileSize;
Common::SeekableReadStream *heapSaveFile = openSaveFileForReading(1, true, fileName); Common::SeekableReadStream *heapSaveFile = openSaveFileForReading(1, true, fileName);
hdr.type = heapSaveFile->readUint32BE(); hdr.type = heapSaveFile->readUint32BE();
@ -174,7 +173,6 @@ void ScummEngine::copyHeapSaveGameToFile(int slot, const char *saveName) {
heapSaveFile->read(hdr.name, sizeof(hdr.name)); heapSaveFile->read(hdr.name, sizeof(hdr.name));
Common::strlcpy(hdr.name, saveName, sizeof(hdr.name)); Common::strlcpy(hdr.name, saveName, sizeof(hdr.name));
heapFileSize = (uint32)heapSaveFile->size();
if (heapSaveFile->err() || hdr.type != MKTAG('S','C','V','M')) { if (heapSaveFile->err() || hdr.type != MKTAG('S','C','V','M')) {
saveFailed = true; saveFailed = true;
} else { } else {