[Scummvm-git-logs] scummvm master -> 84644fa9986ab876a6962d799906975d6a7a837e

Sat Aug 16 14:39:41 UTC 2025

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

Summary:
cfb49a989b ZVISION: Silence -Wbitwise-instead-of-logical warning
34cd85a738 PARALLACTION: Fix small warning in --disable-tts builds
a9063b984e IOS7: Fix include syntax for internal headers
d643b486a2 PSP: Fix include syntax for internal headers
9f37f7749b MACOS: Fix include syntax for internal headers
b38d6eaf3e DARKSEED: Fix include syntax for internal headers
f1246c5622 LASTEXPRESS: Fix include syntax for internal headers
3c2fb74429 TETRAEDGE: Fix include syntax for internal headers
39463510ae TRECISION: Fix include syntax for internal headers
7ad635f70d WINTERMUTE: Fix include syntax for internal headers
84644fa998 TEST: Fix include syntax for internal headers


Commit: cfb49a989ba42432a464be7013d46d8c33841e18
    https://github.com/scummvm/scummvm/commit/cfb49a989ba42432a464be7013d46d8c33841e18
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:21:14+02:00

Commit Message:
ZVISION: Silence -Wbitwise-instead-of-logical warning

Changed paths:
    engines/zvision/common/scroller.cpp

diff --git a/engines/zvision/common/scroller.cpp b/engines/zvision/common/scroller.cpp
index ccbccc15128..768b8a323ea 100644
--- a/engines/zvision/common/scroller.cpp
+++ b/engines/zvision/common/scroller.cpp
@@ -105,7 +105,7 @@ void Scroller::setActive(bool active) {
 }
 
 bool Scroller::isMoving() {
-	return _xScroller.isMoving() | _yScroller.isMoving();
+	return _xScroller.isMoving() || _yScroller.isMoving();
 }
 
 bool Scroller::update(uint32 deltatime) {


Commit: 34cd85a738708f2f0a4cc278d20a308d682813de
    https://github.com/scummvm/scummvm/commit/34cd85a738708f2f0a4cc278d20a308d682813de
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:22:44+02:00

Commit Message:
PARALLACTION: Fix small warning in --disable-tts builds

Changed paths:
    engines/parallaction/dialogue.cpp


diff --git a/engines/parallaction/dialogue.cpp b/engines/parallaction/dialogue.cpp
index 53bdf03481c..9145254d1d9 100644
--- a/engines/parallaction/dialogue.cpp
+++ b/engines/parallaction/dialogue.cpp
@@ -49,7 +49,9 @@ struct BalloonPositions {
 
 
 
+#ifdef USE_TTS
 static const int kNumberOfVoiceDatas = 65;
+#endif
 
 class DialogueManager {
 


Commit: a9063b984eacc229e6bb7fd8c52c465413cd2658
    https://github.com/scummvm/scummvm/commit/a9063b984eacc229e6bb7fd8c52c465413cd2658
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:24:38+02:00

Commit Message:
IOS7: Fix include syntax for internal headers

Changed paths:
    backends/platform/ios7/ios7_misc.mm


diff --git a/backends/platform/ios7/ios7_misc.mm b/backends/platform/ios7/ios7_misc.mm
index db9380ac208..b6de58d24e6 100644
--- a/backends/platform/ios7/ios7_misc.mm
+++ b/backends/platform/ios7/ios7_misc.mm
@@ -24,8 +24,9 @@
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSPathUtilities.h>
+
 #include "backends/platform/ios7/ios7_common.h"
-#include <common/str.h>
+#include "common/str.h"
 
 Common::String iOS7_getDocumentsDir() {
 #if TARGET_OS_IOS


Commit: d643b486a22361e62b3341ef4f8312adde4ada1e
    https://github.com/scummvm/scummvm/commit/d643b486a22361e62b3341ef4f8312adde4ada1e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:25:08+02:00

Commit Message:
PSP: Fix include syntax for internal headers

Changed paths:
    backends/platform/psp/psp_main.cpp


diff --git a/backends/platform/psp/psp_main.cpp b/backends/platform/psp/psp_main.cpp
index 3f08099d714..209037fcb19 100644
--- a/backends/platform/psp/psp_main.cpp
+++ b/backends/platform/psp/psp_main.cpp
@@ -44,13 +44,13 @@
 
 #include <psppower.h>
 
-#include <common/system.h>
-#include <engines/engine.h>
-#include <base/main.h>
-#include <base/plugins.h>
+#include "common/system.h"
+#include "engines/engine.h"
+#include "base/main.h"
+#include "base/plugins.h"
+
 #include "backends/platform/psp/powerman.h"
 #include "backends/platform/psp/thread.h"
-
 #include "backends/plugins/psp/psp-provider.h"
 #include "backends/platform/psp/psppixelformat.h"
 #include "backends/platform/psp/osys_psp.h"


Commit: 9f37f7749b0d9e7f52c0914a443d3832ba00344e
    https://github.com/scummvm/scummvm/commit/9f37f7749b0d9e7f52c0914a443d3832ba00344e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:26:44+02:00

Commit Message:
MACOS: Fix include syntax for internal headers

Changed paths:
    backends/platform/sdl/macosx/macosx_wrapper.h


diff --git a/backends/platform/sdl/macosx/macosx_wrapper.h b/backends/platform/sdl/macosx/macosx_wrapper.h
index 41e064fc389..2893cd9ca5c 100644
--- a/backends/platform/sdl/macosx/macosx_wrapper.h
+++ b/backends/platform/sdl/macosx/macosx_wrapper.h
@@ -22,7 +22,7 @@
 #ifndef PLATFORM_SDL_MACOSX_WRAPPER_H
 #define PLATFORM_SDL_MACOSX_WRAPPER_H
 
-#include <common/str.h>
+#include "common/str.h"
 
 Common::String getDesktopPathMacOSX();
 Common::String getDocumentsPathMacOSX();


Commit: b38d6eaf3e78982e62a3146ad9bd7d000a7fe6a3
    https://github.com/scummvm/scummvm/commit/b38d6eaf3e78982e62a3146ad9bd7d000a7fe6a3
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:27:23+02:00

Commit Message:
DARKSEED: Fix include syntax for internal headers

Changed paths:
    engines/darkseed/zhmenufont.h


diff --git a/engines/darkseed/zhmenufont.h b/engines/darkseed/zhmenufont.h
index 50c27ea9a48..147b04d3c23 100644
--- a/engines/darkseed/zhmenufont.h
+++ b/engines/darkseed/zhmenufont.h
@@ -22,7 +22,7 @@
 #ifndef DARKSEED_ZHMENUFONT_H
 #define DARKSEED_ZHMENUFONT_H
 
-#include <common/array.h>
+#include "common/array.h"
 #include "graphics/font.h"
 #include "graphics/surface.h"
 


Commit: f1246c562277de186533926d1023c419052ad238
    https://github.com/scummvm/scummvm/commit/f1246c562277de186533926d1023c419052ad238
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:27:32+02:00

Commit Message:
LASTEXPRESS: Fix include syntax for internal headers

Changed paths:
    engines/lastexpress/sound/slot.h


diff --git a/engines/lastexpress/sound/slot.h b/engines/lastexpress/sound/slot.h
index 3ee4d46a51c..1322f03bed2 100644
--- a/engines/lastexpress/sound/slot.h
+++ b/engines/lastexpress/sound/slot.h
@@ -33,7 +33,7 @@ class Subtitle;
 class SoundManager;
 struct HPF;
 
-#include <common/pack-start.h>
+#include "common/pack-start.h"
 typedef struct SaveSlot {
 	int32 status;
 	int32 tag;
@@ -61,7 +61,7 @@ typedef struct SaveSlot {
 		memset(name2, 0, 16);
 	}
 } SaveSlot;
-#include <common/pack-end.h>
+#include "common/pack-end.h"
 
 class Slot {
 	friend class Subtitle;


Commit: 3c2fb74429377e09d8b83577752e14766e179ffe
    https://github.com/scummvm/scummvm/commit/3c2fb74429377e09d8b83577752e14766e179ffe
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:28:08+02:00

Commit Message:
TETRAEDGE: Fix include syntax for internal headers

Changed paths:
    engines/tetraedge/te/te_object.h


diff --git a/engines/tetraedge/te/te_object.h b/engines/tetraedge/te/te_object.h
index 4336391511e..f2e4df3ddf4 100644
--- a/engines/tetraedge/te/te_object.h
+++ b/engines/tetraedge/te/te_object.h
@@ -22,7 +22,7 @@
 #ifndef TETRAEDGE_TE_TE_OBJECT_H
 #define TETRAEDGE_TE_TE_OBJECT_H
 
-#include <common/array.h>
+#include "common/array.h"
 
 namespace Tetraedge {
 


Commit: 39463510ae08e6bd669d420ee52917730c6830db
    https://github.com/scummvm/scummvm/commit/39463510ae08e6bd669d420ee52917730c6830db
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:28:35+02:00

Commit Message:
TRECISION: Fix include syntax for internal headers

Changed paths:
    engines/trecision/trecision.h


diff --git a/engines/trecision/trecision.h b/engines/trecision/trecision.h
index 82ecbd6820b..54bb35119c7 100644
--- a/engines/trecision/trecision.h
+++ b/engines/trecision/trecision.h
@@ -23,6 +23,7 @@
 #define TRECISION_TRECISION_H
 
 #include "common/str-array.h"
+#include "common/events.h"
 #include "common/keyboard.h"
 #include "common/str.h"
 #include "common/serializer.h"
@@ -35,7 +36,6 @@
 #include "trecision/fastfile.h"
 #include "trecision/struct.h"
 #include "trecision/scheduler.h"
-#include <common/events.h>
 
 namespace Trecision {
 class AnimManager;


Commit: 7ad635f70df4b12753532e3d4697aad05363c949
    https://github.com/scummvm/scummvm/commit/7ad635f70df4b12753532e3d4697aad05363c949
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:28:50+02:00

Commit Message:
WINTERMUTE: Fix include syntax for internal headers

Changed paths:
    engines/wintermute/base/gfx/xbuffer.h


diff --git a/engines/wintermute/base/gfx/xbuffer.h b/engines/wintermute/base/gfx/xbuffer.h
index 486ea2bdd04..be622ec4dbe 100644
--- a/engines/wintermute/base/gfx/xbuffer.h
+++ b/engines/wintermute/base/gfx/xbuffer.h
@@ -22,8 +22,8 @@
 #ifndef WINTERMUTE_XBUFFER_H
 #define WINTERMUTE_XBUFFER_H
 
-#include <common/types.h>
-#include <common/util.h>
+#include "common/types.h"
+#include "common/util.h"
 
 namespace Wintermute {
 


Commit: 84644fa9986ab876a6962d799906975d6a7a837e
    https://github.com/scummvm/scummvm/commit/84644fa9986ab876a6962d799906975d6a7a837e
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2025-08-16T16:29:25+02:00

Commit Message:
TEST: Fix include syntax for internal headers

Changed paths:
    test/common/base64.h
    test/common/pack.h


diff --git a/test/common/base64.h b/test/common/base64.h
index 4bf676d21de..662c21aba83 100644
--- a/test/common/base64.h
+++ b/test/common/base64.h
@@ -30,7 +30,7 @@ static const char *base64_validate_tests[] = {
 	"YQ==YWJj", // data after padding
 };
 
-#include <common/pack-start.h>	// START STRUCT PACKING
+#include "common/pack-start.h"	// START STRUCT PACKING
 
 struct Base64TestStruct {
 	uint32 x;
@@ -40,7 +40,7 @@ struct Base64TestStruct {
 	byte b;
 } PACKED_STRUCT;
 
-#include <common/pack-end.h>	// END STRUCT PACKING
+#include "common/pack-end.h"	// END STRUCT PACKING
 
 class Base64TestSuite : public CxxTest::TestSuite {
 	public:
diff --git a/test/common/pack.h b/test/common/pack.h
index f62b31e9dc2..038097ae8a6 100644
--- a/test/common/pack.h
+++ b/test/common/pack.h
@@ -3,7 +3,7 @@
 #include "common/scummsys.h"
 #include <stddef.h>
 
-#include <common/pack-start.h>	// START STRUCT PACKING
+#include "common/pack-start.h"	// START STRUCT PACKING
 
 struct TestStruct {
 	uint32 x;
@@ -13,7 +13,7 @@ struct TestStruct {
 	byte b;
 } PACKED_STRUCT;
 
-#include <common/pack-end.h>	// END STRUCT PACKING
+#include "common/pack-end.h"	// END STRUCT PACKING
 
 #define OFFS(type,item) (((ptrdiff_t)(&((type *)42)->type::item))-42)
 


