[Scummvm-git-logs] scummvm master -> e4739e44af2c2cf5e4809061727108219f905e1b

[dwatteau]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
7e22daf436 AGOS: Silence MSVC C4146 warning
e4739e44af SCUMM: MACGUI: Remove a stray 'MacGuiImpl::' that confuses MSVC 2015


Commit: 7e22daf436e09a575504a2e06f62d294546f8377
    https://github.com/scummvm/scummvm/commit/7e22daf436e09a575504a2e06f62d294546f8377
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-05T17:52:59+02:00

Commit Message:
AGOS: Silence MSVC C4146 warning

Changed paths:
    engines/agos/subroutine.cpp


diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index 3135c22d29f..eee53c34c83 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -222,7 +222,7 @@ void AGOSEngine::alignTableMem() {
 	size_t delta;
 
 	if (!IS_ALIGNED(uptrVal, sizeof(byte *))) {
-		delta = -uptrVal & (sizeof(byte *) - 1);
+		delta = (~uptrVal + 1) & (sizeof(byte *) - 1);
 		_tablesHeapPtr += delta;
 		_tablesHeapCurPos += delta;
 	}


Commit: e4739e44af2c2cf5e4809061727108219f905e1b
    https://github.com/scummvm/scummvm/commit/e4739e44af2c2cf5e4809061727108219f905e1b
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-10-05T17:52:59+02:00

Commit Message:
SCUMM: MACGUI: Remove a stray 'MacGuiImpl::' that confuses MSVC 2015

Changed paths:
    engines/scumm/macgui/macgui_impl.h


diff --git a/engines/scumm/macgui/macgui_impl.h b/engines/scumm/macgui/macgui_impl.h
index 98792329466..8bec8222ca5 100644
--- a/engines/scumm/macgui/macgui_impl.h
+++ b/engines/scumm/macgui/macgui_impl.h
@@ -746,7 +746,6 @@ public:
 		MacGuiImpl::MacEditText *addEditText(Common::Rect bounds, Common::String text, bool enabled);
 		MacGuiImpl::MacImage *addIcon(int x, int y, int id, bool enabled);
 		MacGuiImpl::MacImage *addPicture(Common::Rect bounds, int id, bool enabled);
-		MacGuiImpl::
 		MacGuiImpl::MacSlider *addSlider(int x, int y, int h, int minValue, int maxValue, int pageSize, bool enabled);
 		MacGuiImpl::MacImageSlider *addImageSlider(int backgroundId, int handleId, bool enabled, int minX, int maxX, int minValue, int maxValue, int leftMargin = 0, int rightMargin = 0);
 		MacGuiImpl::MacImageSlider *addImageSlider(Common::Rect bounds, MacImage *handle, bool enabled, int minX, int maxX, int minValue, int maxValue);