[Scummvm-git-logs] scummvm master -> 75b3203628a60b1fd2e511133df0cae1b48ac128
sev-
noreply at scummvm.org
Wed Jul 1 21:45:24 UTC 2026
This automated email contains information about 10 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
bd91876b11 FREESCAPE: resolve signedness conflict
1454b95e52 BLADERUNNER: resolve signedness conflict
a0c00fa37a SKY: match forward declarations with definitions
e5294a2884 SKY: do not redeclare loop variable
b7a462eeef PELROCK: resolve signedness conflict
e8d4873a77 SKY: resolve signedness conflict
d11897aafd SKY: do not cast constness away
6cc8293c9b NANCY: do not cast constness away
8109043bfe SDL: resolve signedness conflict
75b3203628 SDL: avoid mixed types in conditional clauses
Commit: bd91876b11a65ecff8f6d2cfb2acfd984b853d78
https://github.com/scummvm/scummvm/commit/bd91876b11a65ecff8f6d2cfb2acfd984b853d78
Author: Michael (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
FREESCAPE: resolve signedness conflict
Changed paths:
engines/freescape/games/castle/c64.cpp
diff --git a/engines/freescape/games/castle/c64.cpp b/engines/freescape/games/castle/c64.cpp
index a65848797e6..7057c05b5b2 100644
--- a/engines/freescape/games/castle/c64.cpp
+++ b/engines/freescape/games/castle/c64.cpp
@@ -446,7 +446,7 @@ void CastleEngine::loadAssetsC64FullGame() {
for (uint i = 0; i < database[0]; i++) {
uint16 areaOffset = readCastleC64Uint16LE(database, kCastleC64RuntimeAreaTableOffset + 2 * i);
- if (areaOffset + 6 >= database.size())
+ if (areaOffset + 6u >= database.size())
error("Castle C64 area color read out of range at 0x%x", areaOffset);
byte areaID = database[areaOffset + 2];
Commit: 1454b95e5286e7c2a0df046ca1985e29900de3f3
https://github.com/scummvm/scummvm/commit/1454b95e5286e7c2a0df046ca1985e29900de3f3
Author: Michael (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
BLADERUNNER: resolve signedness conflict
Changed paths:
engines/bladerunner/vqa_decoder.cpp
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp
index a50e19a76ff..749c9073c39 100644
--- a/engines/bladerunner/vqa_decoder.cpp
+++ b/engines/bladerunner/vqa_decoder.cpp
@@ -868,7 +868,7 @@ bool VQADecoder::VQAVideoTrack::readCBFZ(Common::SeekableReadStream *s, uint32 s
uint16 *block_src = (uint16 *)codebookInfo.data;
uint8 *mask_src = (uint8 *)codebookInfo.data + (bpp * _maxBlocks * _blockW * _blockH);
- for (uint x = 0; x < _maxBlocks * _blockW * _blockH; ++x) {
+ for (uint x = 0; x < static_cast<uint>(_maxBlocks * _blockW * _blockH); ++x) {
#ifdef SCUMM_BIG_ENDIAN
// Swap bytes to big endian as the source is little endian
block_src[x] = SWAP_BYTES_16(block_src[x]);
Commit: a0c00fa37a60a2dbfedd7f2decf4c3dc1cb2498b
https://github.com/scummvm/scummvm/commit/a0c00fa37a60a2dbfedd7f2decf4c3dc1cb2498b
Author: Michael (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
SKY: match forward declarations with definitions
Changed paths:
engines/sky/disk.h
diff --git a/engines/sky/disk.h b/engines/sky/disk.h
index 4bf19e60484..d11654112fb 100644
--- a/engines/sky/disk.h
+++ b/engines/sky/disk.h
@@ -35,8 +35,8 @@ class File;
}
namespace Graphics {
-class Surface;
-class PixelFormat;
+struct Surface;
+struct PixelFormat;
}
struct FileEntry {
Commit: e5294a2884d80637d1521d21a42d6bda81e3797d
https://github.com/scummvm/scummvm/commit/e5294a2884d80637d1521d21a42d6bda81e3797d
Author: Michael (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
SKY: do not redeclare loop variable
Changed paths:
engines/sky/screen.cpp
diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp
index 71e7e7308d1..a449cf74c00 100644
--- a/engines/sky/screen.cpp
+++ b/engines/sky/screen.cpp
@@ -167,7 +167,6 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
_skyDisk = pDisk;
_skyCompact = skyCompact;
- int i;
uint8 tmpPal[VGA_COLORS * 3];
_gameGrid = (uint8 *)malloc(GRID_X * GRID_Y * 2);
@@ -182,7 +181,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
memset(tmpPal, 0, GAME_COLORS * 3);
//set the remaining colors
- for (i = 0; i < (VGA_COLORS-GAME_COLORS); i++) {
+ for (int i = 0; i < (VGA_COLORS-GAME_COLORS); i++) {
tmpPal[3 * GAME_COLORS + i * 3 + 0] = (_top16Colors[i * 3 + 0] << 2) + (_top16Colors[i * 3 + 0] >> 4);
tmpPal[3 * GAME_COLORS + i * 3 + 1] = (_top16Colors[i * 3 + 1] << 2) + (_top16Colors[i * 3 + 1] >> 4);
tmpPal[3 * GAME_COLORS + i * 3 + 2] = (_top16Colors[i * 3 + 2] << 2) + (_top16Colors[i * 3 + 2] >> 4);
Commit: b7a462eeef5aaae25ac18ce61eced1ad15ffbf6a
https://github.com/scummvm/scummvm/commit/b7a462eeef5aaae25ac18ce61eced1ad15ffbf6a
Author: Michael (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
PELROCK: resolve signedness conflict
Changed paths:
engines/pelrock/types.h
diff --git a/engines/pelrock/types.h b/engines/pelrock/types.h
index c3c2c21227a..f866c59d75b 100644
--- a/engines/pelrock/types.h
+++ b/engines/pelrock/types.h
@@ -499,7 +499,7 @@ struct RoomPasserBys {
* Structure to hold a parsed choice option
*/
struct ChoiceOption {
- byte room = -1;
+ byte room = static_cast<byte>(-1);
int choiceIndex;
Common::String text;
uint32 dataOffset;
Commit: e8d4873a77518da6b89ebf7f779342d8c39a3990
https://github.com/scummvm/scummvm/commit/e8d4873a77518da6b89ebf7f779342d8c39a3990
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
SKY: resolve signedness conflict
Changed paths:
engines/sky/inventory.cpp
diff --git a/engines/sky/inventory.cpp b/engines/sky/inventory.cpp
index 689a67d328c..3812feb2d28 100644
--- a/engines/sky/inventory.cpp
+++ b/engines/sky/inventory.cpp
@@ -88,7 +88,7 @@ void Logic::startInventory(uint32 highlightedId) {
void Logic::killInventory() {
// shut down displayed inv objects
- int j;
+ uint32 j;
Compact *itemData;
if (_liveInv) {
Commit: d11897aafd4f06de2a7e93130d4f5c300cdcf496
https://github.com/scummvm/scummvm/commit/d11897aafd4f06de2a7e93130d4f5c300cdcf496
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
SKY: do not cast constness away
Changed paths:
engines/sky/disk.cpp
diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp
index 70586ec7662..d3483893a83 100644
--- a/engines/sky/disk.cpp
+++ b/engines/sky/disk.cpp
@@ -37,8 +37,8 @@ static const char *const dataFilename = "sky.dsk";
static const char *const dinnerFilename = "sky.dnr";
static int hashCompFunc(const void *m1, const void *m2) {
- FileEntry *e1 = (FileEntry *)m1;
- FileEntry *e2 = (FileEntry *)m2;
+ const FileEntry *e1 = static_cast<const FileEntry *>(m1);
+ const FileEntry *e2 = static_cast<const FileEntry *>(m2);
if (e1->_fileNum == e2->_fileNum)
return 0;
return (e1->_fileNum < e2->_fileNum ? -1 : 1);
Commit: 6cc8293c9b72def358cb17abde8c6594bf52cecb
https://github.com/scummvm/scummvm/commit/6cc8293c9b72def358cb17abde8c6594bf52cecb
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
NANCY: do not cast constness away
Changed paths:
engines/nancy/nancy.cpp
diff --git a/engines/nancy/nancy.cpp b/engines/nancy/nancy.cpp
index fbf783eeade..68778d92ce1 100644
--- a/engines/nancy/nancy.cpp
+++ b/engines/nancy/nancy.cpp
@@ -258,7 +258,7 @@ const Common::String NancyEngine::getEventFlagName(uint flagID) const {
if (flagID >= 2000) {
flagID -= 2000;
- const Common::Array<Common::String> &flagNames = ((EVNT *)getEngineData("EVNT"))->eventFlagNames;
+ const Common::Array<Common::String> &flagNames = dynamic_cast<const EVNT *>(getEngineData("EVNT"))->eventFlagNames;
return (flagID < flagNames.size()) ? flagNames[flagID] : "";
}
Commit: 8109043bfed9ca84119ad3f2d0ce4b6511933945
https://github.com/scummvm/scummvm/commit/8109043bfed9ca84119ad3f2d0ce4b6511933945
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
SDL: resolve signedness conflict
Changed paths:
backends/events/sdl/sdl3-events.cpp
diff --git a/backends/events/sdl/sdl3-events.cpp b/backends/events/sdl/sdl3-events.cpp
index 43daa780348..c2d061904d9 100644
--- a/backends/events/sdl/sdl3-events.cpp
+++ b/backends/events/sdl/sdl3-events.cpp
@@ -931,7 +931,7 @@ bool SdlEventSource::handleJoystickAdded(const SDL_JoyDeviceEvent &device, Commo
debug(5, "SdlEventSource: Received joystick added event for index '%d'", device.which);
int joystick_num = ConfMan.getInt("joystick_num");
- if (joystick_num != device.which) {
+ if (joystick_num != static_cast<int>(device.which)) {
return false;
}
Commit: 75b3203628a60b1fd2e511133df0cae1b48ac128
https://github.com/scummvm/scummvm/commit/75b3203628a60b1fd2e511133df0cae1b48ac128
Author: Michael Kuerbis (michael_kuerbis at web.de)
Date: 2026-07-01T23:45:15+02:00
Commit Message:
SDL: avoid mixed types in conditional clauses
Changed paths:
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 8c6e34c3347..b59cc6898d8 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -2362,8 +2362,8 @@ void SurfaceSdlGraphicsManager::blitCursor() {
_cursorNeedsRedraw = true;
- frac_t cursorScaleX = _cursorScaleX == 0 ? FRAC_ONE : _videoMode.scaleFactor * _cursorScaleX;
- frac_t cursorScaleY = _cursorScaleY == 0 ? FRAC_ONE : _videoMode.scaleFactor * _cursorScaleY;
+ frac_t cursorScaleX = _cursorScaleX == 0 ? static_cast<frac_t>(FRAC_ONE) : _videoMode.scaleFactor * _cursorScaleX;
+ frac_t cursorScaleY = _cursorScaleY == 0 ? static_cast<frac_t>(FRAC_ONE) : _videoMode.scaleFactor * _cursorScaleY;
// Adapt the real hotspot according to the scale factor.
int rW = fracToInt(w * cursorScaleX);
More information about the Scummvm-git-logs
mailing list