[Scummvm-git-logs] scummvm master -> 7fcc48244ff8d0940eb6e4f968b8d61495eafc37
bluegr
noreply at scummvm.org
Mon Dec 15 21:43:27 UTC 2025
This automated email contains information about 16 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
a9c0636d03 JANITORIAL: resolve signed/unsigned conflicts
3e9266459a JANITORIAL: ACCESS: resolve signed/unsigned conflicts
07721a7cef JANITORIAL: BLADERUNNER: resolve signed/unsigned conflicts
a40c8d225a JANITORIAL: DGDS: resolve signed/unsigned conflicts
eb2abf534a JANITORIAL: EFH: resolve signed/unsigned conflicts
324c72faf7 JANITORIAL: GLK: resolve signed/unsigned conflicts
acb3694c78 JANITORIAL: GOB: resolve signed/unsigned conflicts
62239ee291 JANITORIAL: SHERLOCK: resolve signed/unsigned conflicts
a84cf07ef9 JANITORIAL: TOT: resolve signed/unsigned conflicts
353e2d1a67 JANITORIAL: TWINE: resolve signed/unsigned conflicts
b555114720 JANITORIAL: ZVISION: resolve signed/unsigned conflicts
52e0236bd4 JANITORIAL: EFH: add comment to explain explicit enum type
d7da95afe0 JANITORIAL: ACCESS: add comment to explain explicit enum type
ba0bdf27fb JANITORIAL: use more specific type than unsigned for casting
c7eebf8fe9 JANITORIAL: ACCESS: type enum directly to Common::CustomEventType
7fcc48244f JANITORIAL: EFH: type enum directly to Common::CustomEventType
Commit: a9c0636d03cb94875afcd41cc553f31c8153feaa
https://github.com/scummvm/scummvm/commit/a9c0636d03cb94875afcd41cc553f31c8153feaa
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: resolve signed/unsigned conflicts
Changed paths:
backends/platform/sdl/sdl.cpp
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index a6f0d170522..291d86ce1cf 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -999,7 +999,7 @@ bool OSystem_SDL::setGraphicsMode(int mode, uint flags) {
// If the new mode and the current mode are not from the same graphics
// manager, delete and create the new mode graphics manager
if (render3d) {
- uint best3DSupport = -1;
+ uint best3DSupport = (uint) -1;
uint i;
// Make sure the requested mode supports 3D
for (i = 0; i < GraphicsManagerCount; ++i) {
Commit: 3e9266459ab3e144825d4926018d103df0fabe0f
https://github.com/scummvm/scummvm/commit/3e9266459ab3e144825d4926018d103df0fabe0f
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: ACCESS: resolve signed/unsigned conflicts
Changed paths:
engines/access/access.h
engines/access/martian/midiparser_bemd.cpp
diff --git a/engines/access/access.h b/engines/access/access.h
index b9e8aa47a5d..7c083c657ee 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -68,7 +68,7 @@ enum AccessDebugChannels {
kDebugSound,
};
-enum ACCESSActions {
+enum ACCESSActions : unsigned {
kActionNone,
kActionMoveUp,
kActionMoveDown,
diff --git a/engines/access/martian/midiparser_bemd.cpp b/engines/access/martian/midiparser_bemd.cpp
index ec0aac99828..791043d15e2 100644
--- a/engines/access/martian/midiparser_bemd.cpp
+++ b/engines/access/martian/midiparser_bemd.cpp
@@ -67,7 +67,7 @@ bool MidiParser_BEmd::loadMusic(const byte *data, uint32 size) {
if (secondBlockOffset < 16 || secondBlockOffset >= size)
error("Bad second block offset in BEmd file");
uint16 secondBlockSize = READ_LE_UINT16(pos + 4);
- if (secondBlockOffset + secondBlockSize != size)
+ if (static_cast<unsigned>(secondBlockOffset + secondBlockSize) != size)
error("Bad second block offset+size in BEmd file");
_trackDataEnd = data + secondBlockOffset;
Commit: 07721a7cefbda4d1e3fd1dfb19e69200be4577a3
https://github.com/scummvm/scummvm/commit/07721a7cefbda4d1e3fd1dfb19e69200be4577a3
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: BLADERUNNER: resolve signed/unsigned conflicts
Changed paths:
engines/bladerunner/vqa_decoder.cpp
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp
index 2647a25f978..b6842568a76 100644
--- a/engines/bladerunner/vqa_decoder.cpp
+++ b/engines/bladerunner/vqa_decoder.cpp
@@ -1132,7 +1132,7 @@ void VQADecoder::VQAVideoTrack::VPTRWriteBlock(Graphics::Surface *surface, unsig
return;
}
// Create mask using alpha values
- for (uint x = 0; x < _blockW * _blockH; ++x) {
+ for (uint x = 0; x < static_cast<unsigned>(_blockW * _blockH); ++x) {
// Extract alpha value
// We XOR it with 1 to invert and get an actual alpha value
mask[x] = (byte)(READ_UINT16(src_p + x) >> 15) ^ 0x01;
Commit: a40c8d225a811d4361430e0f12dc864775b4b5b6
https://github.com/scummvm/scummvm/commit/a40c8d225a811d4361430e0f12dc864775b4b5b6
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: DGDS: resolve signed/unsigned conflicts
Changed paths:
engines/dgds/image.cpp
diff --git a/engines/dgds/image.cpp b/engines/dgds/image.cpp
index 6175b1882b3..5ca68f76d78 100644
--- a/engines/dgds/image.cpp
+++ b/engines/dgds/image.cpp
@@ -432,13 +432,13 @@ void Image::loadBitmap4(Graphics::ManagedSurface *surf, uint32 toffset, Common::
stream->skip(toffset >> 1);
if (highByte) {
- for (uint32 i = 0; i < tw * th; i += 2) {
+ for (uint32 i = 0; i < static_cast<unsigned>(tw * th); i += 2) {
byte val = stream->readByte();
data[i + 0] |= val & 0xF0;
data[i + 1] |= (val & 0x0F) << 4;
}
} else {
- for (uint32 i = 0; i < tw * th; i += 2) {
+ for (uint32 i = 0; i < static_cast<unsigned>(tw * th); i += 2) {
byte val = stream->readByte();
data[i + 0] |= (val & 0xF0) >> 4;
data[i + 1] |= val & 0x0F;
Commit: eb2abf534a14b315718ebe0185097b5c9da44122
https://github.com/scummvm/scummvm/commit/eb2abf534a14b315718ebe0185097b5c9da44122
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: EFH: resolve signed/unsigned conflicts
Changed paths:
engines/efh/efh.h
diff --git a/engines/efh/efh.h b/engines/efh/efh.h
index 2ac1b54c3ec..7d3203d4feb 100644
--- a/engines/efh/efh.h
+++ b/engines/efh/efh.h
@@ -264,7 +264,7 @@ enum TTSMenuRestriction {
kMenu
};
-enum EFHAction {
+enum EFHAction : unsigned {
kActionNone,
kActionQuit,
kActionSkipVideo,
Commit: 324c72faf7e66b8d6ca5232667b1e6fdf607439b
https://github.com/scummvm/scummvm/commit/324c72faf7e66b8d6ca5232667b1e6fdf607439b
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: GLK: resolve signed/unsigned conflicts
Changed paths:
engines/glk/scott/hulk.cpp
diff --git a/engines/glk/scott/hulk.cpp b/engines/glk/scott/hulk.cpp
index 299fc6416b5..c419256eec0 100644
--- a/engines/glk/scott/hulk.cpp
+++ b/engines/glk/scott/hulk.cpp
@@ -421,7 +421,7 @@ int tryLoadingHulk(GameInfo info, int dictStart) {
_G(_hulkItemImageOffsets) = 0x2731;
_G(_hulkLookImageOffsets) = 0x2761;
_G(_hulkSpecialImageOffsets) = 0x2781;
- _G(_hulkImageOffset) = -0x7ff;
+ _G(_hulkImageOffset) = static_cast<size_t>(-0x7ff);
}
return 1;
Commit: acb3694c781fe56e3135a1344b09433208fd4fce
https://github.com/scummvm/scummvm/commit/acb3694c781fe56e3135a1344b09433208fd4fce
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: GOB: resolve signed/unsigned conflicts
Changed paths:
engines/gob/inter_v7.cpp
engines/gob/videoplayer.cpp
diff --git a/engines/gob/inter_v7.cpp b/engines/gob/inter_v7.cpp
index 38c3d9b7166..ed332185011 100644
--- a/engines/gob/inter_v7.cpp
+++ b/engines/gob/inter_v7.cpp
@@ -952,9 +952,9 @@ void Inter_v7::o7_getFileInfo() {
return;
}
- uint32 width = -1;
- uint32 height = -1;
- uint32 bpp = -1;
+ uint32 width = (uint32)-1;
+ uint32 height = (uint32)-1;
+ uint32 bpp = (uint32)-1;
Surface::getImageInfo(*imageFile, width, height, bpp);
if (property == "IMAGELARGEUR")
storeValue(resultVar, resultVarType, width);
diff --git a/engines/gob/videoplayer.cpp b/engines/gob/videoplayer.cpp
index b71f3faebd4..6669af17bb1 100644
--- a/engines/gob/videoplayer.cpp
+++ b/engines/gob/videoplayer.cpp
@@ -537,7 +537,7 @@ void VideoPlayer::updateLive(bool force, int exceptSlot) {
if ((_vm->getGameType() == kGameTypeAdibou2 || _vm->getGameType() == kGameTypeAdi4) &&
i >= 0 &&
i < kVideoSlotWithCurFrameVarCount)
- WRITE_VAR(53 + i, -1);
+ WRITE_VAR(53 + i, (uint32)-1);
if (i != exceptSlot)
updateLive(i, force);
Commit: 62239ee291c6aba670ec329368d19de93381890a
https://github.com/scummvm/scummvm/commit/62239ee291c6aba670ec329368d19de93381890a
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: SHERLOCK: resolve signed/unsigned conflicts
Changed paths:
engines/sherlock/scalpel/scalpel_inventory.cpp
engines/sherlock/scalpel/settings.cpp
diff --git a/engines/sherlock/scalpel/scalpel_inventory.cpp b/engines/sherlock/scalpel/scalpel_inventory.cpp
index 953b6786d06..e1aab91d8a8 100644
--- a/engines/sherlock/scalpel/scalpel_inventory.cpp
+++ b/engines/sherlock/scalpel/scalpel_inventory.cpp
@@ -106,7 +106,7 @@ void ScalpelInventory::drawInventory(InvNewMode mode) {
assert((uint)mode < ARRAYSIZE(_actionsIndexed));
ui._oldAction = _actionsIndexed[mode];
} else {
- ui._oldAction = -1;
+ ui._oldAction = (Common::CustomEventType) -1;
}
invCommands(0);
diff --git a/engines/sherlock/scalpel/settings.cpp b/engines/sherlock/scalpel/settings.cpp
index b4c658531fe..0e464c988ae 100644
--- a/engines/sherlock/scalpel/settings.cpp
+++ b/engines/sherlock/scalpel/settings.cpp
@@ -460,7 +460,7 @@ void Settings::show(SherlockEngine *vm) {
ui._actionPress = kActionNone;
ui._actionInput = false;
ui._windowBounds.top = CONTROLS_Y1;
- ui._action = -1;
+ ui._action = (Common::CustomEventType) -1;
}
} // End of namespace Scalpel
Commit: a84cf07ef948cbda0ac25ef7ba10b2d3ec2f66b7
https://github.com/scummvm/scummvm/commit/a84cf07ef948cbda0ac25ef7ba10b2d3ec2f66b7
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: TOT: resolve signed/unsigned conflicts
Changed paths:
engines/tot/chrono.cpp
engines/tot/engine.cpp
diff --git a/engines/tot/chrono.cpp b/engines/tot/chrono.cpp
index 9e4bbe3011d..20b796dbdf5 100644
--- a/engines/tot/chrono.cpp
+++ b/engines/tot/chrono.cpp
@@ -35,7 +35,7 @@ ChronoManager::~ChronoManager() {
void ChronoManager::updateChrono() {
uint32 currentTime = g_system->getMillis();
- if ((currentTime - _lastTick) >= kTickMs / _speedMultiplier) {
+ if ((currentTime - _lastTick) >= static_cast<unsigned>(kTickMs / _speedMultiplier)) {
_gameTick = true;
_tickCount++;
if (_tickCount == kHalfTickMultiplier) {
diff --git a/engines/tot/engine.cpp b/engines/tot/engine.cpp
index 8e5ede60778..817a4e77c7f 100644
--- a/engines/tot/engine.cpp
+++ b/engines/tot/engine.cpp
@@ -206,7 +206,7 @@ static void assembleImage(const byte *img, uint imgPosX, uint imgPosY) {
else
x = imgPosX;
- if (imgPosX + wImg < g_engine->_dirtyMainSpriteX + wBg)
+ if (imgPosX + wImg < static_cast<unsigned>(g_engine->_dirtyMainSpriteX + wBg))
incx = imgPosX + wImg - x;
else
incx = g_engine->_dirtyMainSpriteX + wBg - x;
@@ -216,7 +216,7 @@ static void assembleImage(const byte *img, uint imgPosX, uint imgPosY) {
else
y = imgPosY;
- if (imgPosY + hImg < g_engine->_dirtyMainSpriteY + hBg)
+ if (imgPosY + hImg < static_cast<unsigned>(g_engine->_dirtyMainSpriteY + hBg))
incy = imgPosY + hImg - y;
else
incy = g_engine->_dirtyMainSpriteY + hBg - y;
@@ -891,13 +891,13 @@ void TotEngine::useInventoryObjectWithInventoryObject(int16 objectCode1, int16 o
}
invIndex = 0;
- while (_inventory[invIndex].code != objectCode1) {
+ while (static_cast<uint>(_inventory[invIndex].code) != objectCode1) {
invIndex += 1;
}
indobj1 = invIndex;
invIndex = 0;
- while (_inventory[invIndex].code != objectCode2) {
+ while (static_cast<uint>(_inventory[invIndex].code) != objectCode2) {
invIndex += 1;
}
Commit: 353e2d1a678b1c1e28f46fb7a4bab7eb7370d373
https://github.com/scummvm/scummvm/commit/353e2d1a678b1c1e28f46fb7a4bab7eb7370d373
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: TWINE: resolve signed/unsigned conflicts
Changed paths:
engines/twine/renderer/redraw.cpp
diff --git a/engines/twine/renderer/redraw.cpp b/engines/twine/renderer/redraw.cpp
index 86c70df90d0..24f4ef0fef0 100644
--- a/engines/twine/renderer/redraw.cpp
+++ b/engines/twine/renderer/redraw.cpp
@@ -674,7 +674,7 @@ void Redraw::processDrawList(DrawListStruct *drawList, int32 drawListPos, bool b
if (drawList[i].numObj == OWN_ACTOR_SCENE_INDEX && drawList[i].type == DrawListType::DrawShadows) {
shadowtwinsen = true;
processDrawListShadows(drawList[i]);
- drawList[i].type = -1; // invalidate shadow entry
+ drawList[i].type = (uint32)-1; // invalidate shadow entry
break;
}
}
Commit: b555114720cc5c85e63ad3a621ebb8117aa413ca
https://github.com/scummvm/scummvm/commit/b555114720cc5c85e63ad3a621ebb8117aa413ca
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: ZVISION: resolve signed/unsigned conflicts
Changed paths:
engines/zvision/graphics/render_manager.cpp
engines/zvision/text/subtitle_manager.cpp
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index 9431a5b3d88..5551040828f 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -119,7 +119,7 @@ void RenderManager::initialize(bool hiRes) {
debugC(1, kDebugGraphics, "Switching to standard resolution");
#endif
_screen.create(_screenArea.width(), _screenArea.height(), _engine->_screenPixelFormat);
- _screen.setTransparentColor(-1);
+ _screen.setTransparentColor((uint32)-1);
_screen.clear();
debugC(1, kDebugGraphics, "_workingAreaCenter = %d,%d", _workingAreaCenter.x, _workingAreaCenter.y);
@@ -227,10 +227,10 @@ bool RenderManager::renderSceneToScreen(bool immediate, bool overlayOnly, bool p
return false;
} else {
debugC(5, kDebugGraphics, "Rendering menu");
- _menuManagedSurface.transBlitFrom(_menuSurface, -1);
+ _menuManagedSurface.transBlitFrom(_menuSurface, (uint32)-1);
debugC(5, kDebugGraphics, "\tCumulative render time this frame: %d ms", _system->getMillis() - startTime);
debugC(5, kDebugGraphics, "Rendering text");
- _textManagedSurface.transBlitFrom(_textSurface, -1);
+ _textManagedSurface.transBlitFrom(_textSurface, (uint32)-1);
debugC(5, kDebugGraphics, "\tCumulative render time this frame: %d ms", _system->getMillis() - startTime);
if (immediate) {
_frameLimiter.startFrame();
diff --git a/engines/zvision/text/subtitle_manager.cpp b/engines/zvision/text/subtitle_manager.cpp
index d4d1e155fbc..ee44da8f1d5 100644
--- a/engines/zvision/text/subtitle_manager.cpp
+++ b/engines/zvision/text/subtitle_manager.cpp
@@ -81,7 +81,7 @@ void SubtitleManager::process(int32 deltatime) {
Graphics::Surface textSurface;
//TODO - make this surface a persistent member of the manager; only call create() when currently displayed subtitle is changed.
textSurface.create(sub->_textArea.width(), sub->_textArea.height(), _engine->_resourcePixelFormat);
- textSurface.fillRect(Common::Rect(sub->_textArea.width(), sub->_textArea.height()), -1); // TODO Unnecessary operation? Check later.
+ textSurface.fillRect(Common::Rect(sub->_textArea.width(), sub->_textArea.height()), (uint32)-1); // TODO Unnecessary operation? Check later.
_engine->getTextRenderer()->drawTextWithWordWrapping(sub->_lines[sub->_lineId].subStr, textSurface, _engine->isWidescreen());
_renderManager->blitSurfaceToText(textSurface, sub->_textArea.left, sub->_textArea.top, -1);
textSurface.free();
Commit: 52e0236bd46b5c9f67894908c592df51eb551e62
https://github.com/scummvm/scummvm/commit/52e0236bd46b5c9f67894908c592df51eb551e62
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: EFH: add comment to explain explicit enum type
Changed paths:
engines/efh/efh.h
diff --git a/engines/efh/efh.h b/engines/efh/efh.h
index 7d3203d4feb..73bd50297fc 100644
--- a/engines/efh/efh.h
+++ b/engines/efh/efh.h
@@ -264,6 +264,7 @@ enum TTSMenuRestriction {
kMenu
};
+/* unsigned to match Common::CustomEventType, aka uint32 */
enum EFHAction : unsigned {
kActionNone,
kActionQuit,
Commit: d7da95afe0901093106140837470730e9b683c05
https://github.com/scummvm/scummvm/commit/d7da95afe0901093106140837470730e9b683c05
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: ACCESS: add comment to explain explicit enum type
Changed paths:
engines/access/access.h
diff --git a/engines/access/access.h b/engines/access/access.h
index 7c083c657ee..72d21d22a68 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -68,6 +68,7 @@ enum AccessDebugChannels {
kDebugSound,
};
+/* unsigned to match Common::CustomEventType, aka uint32 */
enum ACCESSActions : unsigned {
kActionNone,
kActionMoveUp,
Commit: ba0bdf27fbad3dd05fffeec63e6266125b55d53a
https://github.com/scummvm/scummvm/commit/ba0bdf27fbad3dd05fffeec63e6266125b55d53a
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: use more specific type than unsigned for casting
Changed paths:
engines/access/martian/midiparser_bemd.cpp
engines/bladerunner/vqa_decoder.cpp
engines/dgds/image.cpp
engines/tot/chrono.cpp
engines/tot/engine.cpp
diff --git a/engines/access/martian/midiparser_bemd.cpp b/engines/access/martian/midiparser_bemd.cpp
index 791043d15e2..18b2e01833c 100644
--- a/engines/access/martian/midiparser_bemd.cpp
+++ b/engines/access/martian/midiparser_bemd.cpp
@@ -67,7 +67,7 @@ bool MidiParser_BEmd::loadMusic(const byte *data, uint32 size) {
if (secondBlockOffset < 16 || secondBlockOffset >= size)
error("Bad second block offset in BEmd file");
uint16 secondBlockSize = READ_LE_UINT16(pos + 4);
- if (static_cast<unsigned>(secondBlockOffset + secondBlockSize) != size)
+ if (static_cast<uint32>(secondBlockOffset + secondBlockSize) != size)
error("Bad second block offset+size in BEmd file");
_trackDataEnd = data + secondBlockOffset;
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp
index b6842568a76..e6de1327a6a 100644
--- a/engines/bladerunner/vqa_decoder.cpp
+++ b/engines/bladerunner/vqa_decoder.cpp
@@ -1132,7 +1132,7 @@ void VQADecoder::VQAVideoTrack::VPTRWriteBlock(Graphics::Surface *surface, unsig
return;
}
// Create mask using alpha values
- for (uint x = 0; x < static_cast<unsigned>(_blockW * _blockH); ++x) {
+ for (uint x = 0; x < static_cast<uint>(_blockW * _blockH); ++x) {
// Extract alpha value
// We XOR it with 1 to invert and get an actual alpha value
mask[x] = (byte)(READ_UINT16(src_p + x) >> 15) ^ 0x01;
diff --git a/engines/dgds/image.cpp b/engines/dgds/image.cpp
index 5ca68f76d78..1e6cc10a188 100644
--- a/engines/dgds/image.cpp
+++ b/engines/dgds/image.cpp
@@ -432,13 +432,13 @@ void Image::loadBitmap4(Graphics::ManagedSurface *surf, uint32 toffset, Common::
stream->skip(toffset >> 1);
if (highByte) {
- for (uint32 i = 0; i < static_cast<unsigned>(tw * th); i += 2) {
+ for (uint32 i = 0; i < static_cast<uint32>(tw * th); i += 2) {
byte val = stream->readByte();
data[i + 0] |= val & 0xF0;
data[i + 1] |= (val & 0x0F) << 4;
}
} else {
- for (uint32 i = 0; i < static_cast<unsigned>(tw * th); i += 2) {
+ for (uint32 i = 0; i < static_cast<uint32>(tw * th); i += 2) {
byte val = stream->readByte();
data[i + 0] |= (val & 0xF0) >> 4;
data[i + 1] |= val & 0x0F;
diff --git a/engines/tot/chrono.cpp b/engines/tot/chrono.cpp
index 20b796dbdf5..00242797e92 100644
--- a/engines/tot/chrono.cpp
+++ b/engines/tot/chrono.cpp
@@ -35,7 +35,7 @@ ChronoManager::~ChronoManager() {
void ChronoManager::updateChrono() {
uint32 currentTime = g_system->getMillis();
- if ((currentTime - _lastTick) >= static_cast<unsigned>(kTickMs / _speedMultiplier)) {
+ if ((currentTime - _lastTick) >= static_cast<uint32>(kTickMs / _speedMultiplier)) {
_gameTick = true;
_tickCount++;
if (_tickCount == kHalfTickMultiplier) {
diff --git a/engines/tot/engine.cpp b/engines/tot/engine.cpp
index 817a4e77c7f..336e81da86a 100644
--- a/engines/tot/engine.cpp
+++ b/engines/tot/engine.cpp
@@ -206,7 +206,7 @@ static void assembleImage(const byte *img, uint imgPosX, uint imgPosY) {
else
x = imgPosX;
- if (imgPosX + wImg < static_cast<unsigned>(g_engine->_dirtyMainSpriteX + wBg))
+ if (imgPosX + wImg < static_cast<uint>(g_engine->_dirtyMainSpriteX + wBg))
incx = imgPosX + wImg - x;
else
incx = g_engine->_dirtyMainSpriteX + wBg - x;
@@ -216,7 +216,7 @@ static void assembleImage(const byte *img, uint imgPosX, uint imgPosY) {
else
y = imgPosY;
- if (imgPosY + hImg < static_cast<unsigned>(g_engine->_dirtyMainSpriteY + hBg))
+ if (imgPosY + hImg < static_cast<uint>(g_engine->_dirtyMainSpriteY + hBg))
incy = imgPosY + hImg - y;
else
incy = g_engine->_dirtyMainSpriteY + hBg - y;
Commit: c7eebf8fe95bba9ba41754577b7fca8b1a860911
https://github.com/scummvm/scummvm/commit/c7eebf8fe95bba9ba41754577b7fca8b1a860911
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: ACCESS: type enum directly to Common::CustomEventType
Changed paths:
engines/access/access.h
diff --git a/engines/access/access.h b/engines/access/access.h
index 72d21d22a68..b0ed6fb8a03 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -68,8 +68,8 @@ enum AccessDebugChannels {
kDebugSound,
};
-/* unsigned to match Common::CustomEventType, aka uint32 */
-enum ACCESSActions : unsigned {
+/* typed enum to match unsignedness of Common::CustomEventType */
+enum ACCESSActions : Common::CustomEventType {
kActionNone,
kActionMoveUp,
kActionMoveDown,
Commit: 7fcc48244ff8d0940eb6e4f968b8d61495eafc37
https://github.com/scummvm/scummvm/commit/7fcc48244ff8d0940eb6e4f968b8d61495eafc37
Author: Michael (michael_kuerbis at web.de)
Date: 2025-12-15T23:43:17+02:00
Commit Message:
JANITORIAL: EFH: type enum directly to Common::CustomEventType
Changed paths:
engines/efh/efh.h
diff --git a/engines/efh/efh.h b/engines/efh/efh.h
index 73bd50297fc..052e994bc0a 100644
--- a/engines/efh/efh.h
+++ b/engines/efh/efh.h
@@ -264,8 +264,8 @@ enum TTSMenuRestriction {
kMenu
};
-/* unsigned to match Common::CustomEventType, aka uint32 */
-enum EFHAction : unsigned {
+/* typed enum to match unsignedness of Common::CustomEventType */
+enum EFHAction : Common::CustomEventType {
kActionNone,
kActionQuit,
kActionSkipVideo,
More information about the Scummvm-git-logs
mailing list