[Scummvm-git-logs] scummvm master -> c64f961f7b55c4bc6d730fff9ce2089c2356e198
bluegr
noreply at scummvm.org
Sun Oct 25 20:14:01 UTC 2026
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
65da186bb9 EEM: resolve signedness mismatch warnings
8158090c94 FOOL: resolve signedness mismatch warning
cb968c02c1 FREESCAPE: resolve signedness warnings
ac48db4775 FREESCAPE: resolve type mismatch in ternary expression
f158dee47b HARVESTER: resolve default value for lambda parameter
c64f961f7b COLONY: do not use memset on types considered non-trivial
Commit: 65da186bb94edf8ac3491633265db7c0c0f1547b
https://github.com/scummvm/scummvm/commit/65da186bb94edf8ac3491633265db7c0c0f1547b
Author: Michael (michael_kuerbis at web.de)
Date: 2026-10-25T22:13:53+02:00
Commit Message:
EEM: resolve signedness mismatch warnings
Changed paths:
engines/eem/ui.cpp
diff --git a/engines/eem/ui.cpp b/engines/eem/ui.cpp
index d3e015dec34..d424c96fcfd 100644
--- a/engines/eem/ui.cpp
+++ b/engines/eem/ui.cpp
@@ -4462,8 +4462,8 @@ void EEMEngine::drawKDBalloonOverCurrentScreen(Common::String text) {
Picture balloon;
const bool haveBalloon =
- _balloonArchive.size() > (bubNum & 0x7F) &&
- _balloonArchive.loadEntry(bubNum & 0x7F, balloon);
+ _balloonArchive.size() > (bubNum & 0x7Fu) &&
+ _balloonArchive.loadEntry(bubNum & 0x7Fu, balloon);
const int balloonX = isMacTalkie() ? 100 : scaleX(0x21);
const int topBandH = isMacTalkie() ? 155 : scaleY(0x50);
@@ -4856,8 +4856,8 @@ void EEMEngine::doAccuse() {
_picsArchive.getPicture(picId, suspect);
Picture balloon;
const bool haveBalloon =
- _balloonArchive.size() > (bubNum & 0x7F) &&
- _balloonArchive.loadEntry(bubNum & 0x7F, balloon);
+ _balloonArchive.size() > (bubNum & 0x7Fu) &&
+ _balloonArchive.loadEntry(bubNum & 0x7Fu, balloon);
int balloonX = macTalkie ? 100 : 0x21;
int balloonY = 1;
@@ -4983,8 +4983,8 @@ void EEMEngine::doAccuse() {
rBub = fitBalloonToText(rBub, react);
Picture rBalloon;
const bool haveR =
- _balloonArchive.size() > (rBub & 0x7F) &&
- _balloonArchive.loadEntry(rBub & 0x7F, rBalloon);
+ _balloonArchive.size() > (rBub & 0x7Fu) &&
+ _balloonArchive.loadEntry(rBub & 0x7Fu, rBalloon);
const int rX = macTalkie ? 100 : 0x21;
int rY = 1;
if (haveR && rBalloon.surface.h < (macTalkie ? 155 : 0x4e))
Commit: 8158090c943bc14450fc3c8ab401a18dae03a795
https://github.com/scummvm/scummvm/commit/8158090c943bc14450fc3c8ab401a18dae03a795
Author: Michael (michael_kuerbis at web.de)
Date: 2026-10-25T22:13:53+02:00
Commit Message:
FOOL: resolve signedness mismatch warning
Changed paths:
engines/fool/fool_game.cpp
diff --git a/engines/fool/fool_game.cpp b/engines/fool/fool_game.cpp
index b7471595b0f..f435529dcfa 100644
--- a/engines/fool/fool_game.cpp
+++ b/engines/fool/fool_game.cpp
@@ -1143,7 +1143,7 @@ void FoolGame::sub_128_1f76() {
// original was 5 ticks
delayFromMarker(10);
// new: empty the event queue, so feedback is instant
- _toolbox->FlushEvents(-1, 0);
+ _toolbox->FlushEvents(static_cast<uint32>(-1), 0);
var_i16_7a8 = _toolbox->GetNextEvent(-1, _event);
} while ((_event.modifiers & Graphics::MacToolbox::kModMouseButtonUp) == 0);
} else {
Commit: cb968c02c190206f949d1012dee6e6dd690181a0
https://github.com/scummvm/scummvm/commit/cb968c02c190206f949d1012dee6e6dd690181a0
Author: Michael (michael_kuerbis at web.de)
Date: 2026-10-25T22:13:53+02:00
Commit Message:
FREESCAPE: resolve signedness warnings
Changed paths:
engines/freescape/games/3dck/8bitUI.cpp
engines/freescape/games/3dck/c64.cpp
engines/freescape/games/castle/c64.cpp
diff --git a/engines/freescape/games/3dck/8bitUI.cpp b/engines/freescape/games/3dck/8bitUI.cpp
index ff6021df423..9cfc65861fa 100644
--- a/engines/freescape/games/3dck/8bitUI.cpp
+++ b/engines/freescape/games/3dck/8bitUI.cpp
@@ -170,7 +170,7 @@ void Kit8Engine::updateInstruments() {
void Kit8Engine::drawUI() {
uint32 colors[16];
bool flash = (g_system->getMillis() / 320) & 1;
- for (uint i = 0; i < (isSpectrum() || isC64() ? 16 : 4); i++) {
+ for (uint i = 0; i < (isSpectrum() || isC64() ? 16u : 4u); i++) {
byte r, g, b;
if (isSpectrum() || isC64())
_gfx->readFromPalette(i, r, g, b);
diff --git a/engines/freescape/games/3dck/c64.cpp b/engines/freescape/games/3dck/c64.cpp
index d08183b2be0..b6620f7839a 100644
--- a/engines/freescape/games/3dck/c64.cpp
+++ b/engines/freescape/games/3dck/c64.cpp
@@ -56,7 +56,7 @@ void Kit8Engine::loadPresentationC64() {
_borderSurface.fillRect(_viewArea, 255);
uint16 font = READ_LE_UINT16(runner.data() + 0x1a7b - 0x0400);
- if (font < 0xc400 || font + 64 * 8 > 0xc400 + characters.size())
+ if (font < 0xc400u || font + 64u * 8u > 0xc400u + characters.size())
error("Invalid 3D Construction Kit C64 font address");
for (uint chr = 32; chr < 128; ++chr) {
uint glyph = chr == 32 ? 0 : chr >= 65 ? chr - 64 : chr - 21;
diff --git a/engines/freescape/games/castle/c64.cpp b/engines/freescape/games/castle/c64.cpp
index b647f992ceb..94a2773422a 100644
--- a/engines/freescape/games/castle/c64.cpp
+++ b/engines/freescape/games/castle/c64.cpp
@@ -485,7 +485,7 @@ void CastleEngine::loadAssetsC64FullGame() {
}
uint16 databaseSize = readCastleC64Uint16LE(uiData, kCastleC64DatabaseAddress + 1);
- if (databaseSize < kCastleC64RuntimeAreaTableOffset || kCastleC64DatabaseAddress + databaseSize > uiData.size())
+ if (databaseSize < static_cast<uint16>(kCastleC64RuntimeAreaTableOffset) || static_cast<uint>(kCastleC64DatabaseAddress + databaseSize) > uiData.size())
error("Invalid Castle C64 database size");
Common::Array<byte> database(uiData.data() + kCastleC64DatabaseAddress, databaseSize);
CastleC64DatabaseReadStream databaseStream(database);
Commit: ac48db4775cab8288b76f7c6662d5a984c51ca3c
https://github.com/scummvm/scummvm/commit/ac48db4775cab8288b76f7c6662d5a984c51ca3c
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-10-25T22:13:53+02:00
Commit Message:
FREESCAPE: resolve type mismatch in ternary expression
Changed paths:
engines/freescape/language/detokeniser_freescape.cpp
diff --git a/engines/freescape/language/detokeniser_freescape.cpp b/engines/freescape/language/detokeniser_freescape.cpp
index f894fd1a063..d183d942433 100644
--- a/engines/freescape/language/detokeniser_freescape.cpp
+++ b/engines/freescape/language/detokeniser_freescape.cpp
@@ -105,7 +105,7 @@ static FCLInstruction decodeFreescapeInstruction(const FCLOpcode &entry, const u
instruction.setSource(k8bitVariableScore);
instruction.setDestination(operands[0] | (operands[1] << 8) | (operands[2] << 16));
} else if (entry.opcode == 0x02 || entry.opcode == 0x13) {
- instruction.setSource(entry.opcode == 0x02 ? k8bitVariableEnergy : k8bitVariableShield);
+ instruction.setSource(entry.opcode == 0x02 ? static_cast<uint8>(k8bitVariableEnergy) : k8bitVariableShield);
instruction.setDestination(int8(operands[0]));
} else {
instruction.setDestination(1);
Commit: f158dee47bc703b7387f4bcf21ee0fe51571aeb4
https://github.com/scummvm/scummvm/commit/f158dee47bc703b7387f4bcf21ee0fe51571aeb4
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-10-25T22:13:53+02:00
Commit Message:
HARVESTER: resolve default value for lambda parameter
Default parameter values for lambdas are a C++14 feature.
Changed paths:
engines/harvester/npc/madam_dialogue.cpp
diff --git a/engines/harvester/npc/madam_dialogue.cpp b/engines/harvester/npc/madam_dialogue.cpp
index cee280493f4..a73beb2c17f 100644
--- a/engines/harvester/npc/madam_dialogue.cpp
+++ b/engines/harvester/npc/madam_dialogue.cpp
@@ -51,7 +51,7 @@ Common::Error MadamDialogueHandler::handleDialogue(DialogueRuntime &runtime,
}
runtime.queueDialogueInteractionIfNeeded(interaction);
};
- auto executeActionTagIfSet = [&](const char *actionTag, bool mutatedRuntimeState = false) {
+ auto executeActionTagIfSet = [&](const char *actionTag, bool mutatedRuntimeState) {
InteractionResult interaction;
interaction.mutatedRuntimeState = mutatedRuntimeState;
if (runtime.executeActionTag(actionTag, interaction)) {
@@ -154,7 +154,7 @@ Common::Error MadamDialogueHandler::handleDialogue(DialogueRuntime &runtime,
return lineError;
executeActionTagIfSet(kHurtPcActionTag, removedBarCash200);
- executeActionTagIfSet(kActivateLustExitActionTag);
+ executeActionTagIfSet(kActivateLustExitActionTag, false);
return Common::kNoError;
}
Commit: c64f961f7b55c4bc6d730fff9ce2089c2356e198
https://github.com/scummvm/scummvm/commit/c64f961f7b55c4bc6d730fff9ce2089c2356e198
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-10-25T22:13:53+02:00
Commit Message:
COLONY: do not use memset on types considered non-trivial
Changed paths:
engines/colony/colony.cpp
engines/colony/think.cpp
diff --git a/engines/colony/colony.cpp b/engines/colony/colony.cpp
index efebf4e0900..b9ade441648 100644
--- a/engines/colony/colony.cpp
+++ b/engines/colony/colony.cpp
@@ -210,7 +210,7 @@ ColonyEngine::ColonyEngine(OSystem *syst, const ADGameDescription *gd) : Engine(
// DOS gameInit(): Me.ang=Me.look=32; Me.xloc=4400; Me.yloc=4400.
// intro.c: Me.power[0..2]=POWER(256); armor=SUIT(0); weapons=SUIT(0).
- memset(&_me, 0, sizeof(_me));
+ _me = {};
_me.xloc = 4400;
_me.yloc = 4400;
_me.xindex = _me.xloc >> 8;
@@ -851,7 +851,7 @@ void ColonyEngine::startNewGame() {
_randomSource.setSeed(Common::RandomSource::generateNewSeed());
- memset(&_me, 0, sizeof(_me));
+ _me = {};
_me.xloc = 4400;
_me.yloc = 4400;
_me.xindex = _me.xloc >> 8;
diff --git a/engines/colony/think.cpp b/engines/colony/think.cpp
index de1c3b93db4..ee2e9869365 100644
--- a/engines/colony/think.cpp
+++ b/engines/colony/think.cpp
@@ -726,8 +726,7 @@ int ColonyEngine::scanForPlayer(int num) {
return 0;
Thing &obj = _objects[num - 1];
- Locate fire;
- memset(&fire, 0, sizeof(fire));
+ Locate fire = {};
fire.ang = obj.where.ang;
fire.type = 2;
More information about the Scummvm-git-logs
mailing list