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

sev- noreply at scummvm.org
Fri Apr 10 14:03:49 UTC 2026 

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

Summary:
83f3801098 JANITORIAL: AGS: Remove commented out includes
6ec2ca4b6f BAGEL: Remove system-wide includes
1bd35c970b JANITORIAL: GLK: Remove commented out system-wide includes
c5afb44834 MTROPOLIS: Avoid system-wide include
edc81feb85 MTROPOLIS: Comment out unused variable
ca31362a74 JANITORIAL: PHOENIXVR: Remove unneeded system-wide include
c2f1cf3fee JANITORIAL: SAGA2: Remove system-wide include
e75a6da2cc TWINE: Remove unnecessary system-wide includes
b7b9317de5 WINTERMUTE: Remove system-wide include


Commit: 83f38010986151cf5a51551aa8cb6389cefcbf39
    https://github.com/scummvm/scummvm/commit/83f38010986151cf5a51551aa8cb6389cefcbf39
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T12:39:21+02:00

Commit Message:
JANITORIAL: AGS: Remove commented out includes

Changed paths:
    engines/ags/engine/ac/global_date_time.cpp
    engines/ags/engine/ac/global_debug.h
    engines/ags/engine/ac/string.h
    engines/ags/engine/script/script_api.h
    engines/ags/shared/game/interactions.cpp
    engines/ags/shared/util/buffered_stream.cpp
    engines/ags/shared/util/memory.h
    engines/ags/shared/util/path.cpp
    engines/ags/shared/util/string.h
    engines/ags/tests/test_file.cpp
    engines/ags/tests/test_sprintf.cpp


diff --git a/engines/ags/engine/ac/global_date_time.cpp b/engines/ags/engine/ac/global_date_time.cpp
index 2f373d5f602..90c984ac9fc 100644
--- a/engines/ags/engine/ac/global_date_time.cpp
+++ b/engines/ags/engine/ac/global_date_time.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-//include <time.h>
 #include "ags/engine/ac/global_date_time.h"
 #include "ags/engine/ac/date_time.h"
 #include "ags/shared/ac/common.h"
diff --git a/engines/ags/engine/ac/global_debug.h b/engines/ags/engine/ac/global_debug.h
index bb4267d17c4..9c73510fbf8 100644
--- a/engines/ags/engine/ac/global_debug.h
+++ b/engines/ags/engine/ac/global_debug.h
@@ -22,7 +22,6 @@
 #ifndef AGS_ENGINE_AC_GLOBAL_DEBUG_H
 #define AGS_ENGINE_AC_GLOBAL_DEBUG_H
 
-//include <cstdio>
 #include "ags/shared/util/string.h"
 
 namespace AGS3 {
diff --git a/engines/ags/engine/ac/string.h b/engines/ags/engine/ac/string.h
index e109d9bd9d8..60167ed3b64 100644
--- a/engines/ags/engine/ac/string.h
+++ b/engines/ags/engine/ac/string.h
@@ -22,7 +22,6 @@
 #ifndef AGS_ENGINE_AC_STRING_H
 #define AGS_ENGINE_AC_STRING_H
 
-//include <stdarg.h>
 #include "ags/engine/ac/dynobj/cc_script_object.h"
 #include "ags/shared/util/string.h"
 
diff --git a/engines/ags/engine/script/script_api.h b/engines/ags/engine/script/script_api.h
index 2fe5319df51..b7aad6458b6 100644
--- a/engines/ags/engine/script/script_api.h
+++ b/engines/ags/engine/script/script_api.h
@@ -29,7 +29,6 @@
 #ifndef AGS_ENGINE_SCRIPT_SCRIPT_API_H
 #define AGS_ENGINE_SCRIPT_SCRIPT_API_H
 
-//include <stdarg.h>
 #include "ags/shared/core/types.h"
 #include "ags/engine/ac/runtime_defines.h"
 #include "ags/shared/debugging/out.h"
diff --git a/engines/ags/shared/game/interactions.cpp b/engines/ags/shared/game/interactions.cpp
index 4d689acdd00..5495ffe85a1 100644
--- a/engines/ags/shared/game/interactions.cpp
+++ b/engines/ags/shared/game/interactions.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-//include <string.h>
 #include "ags/shared/ac/common.h" // quit
 #include "ags/shared/game/interactions.h"
 #include "ags/shared/util/stream.h"
diff --git a/engines/ags/shared/util/buffered_stream.cpp b/engines/ags/shared/util/buffered_stream.cpp
index f40a89849f0..73fbdbdb571 100644
--- a/engines/ags/shared/util/buffered_stream.cpp
+++ b/engines/ags/shared/util/buffered_stream.cpp
@@ -19,7 +19,6 @@
  *
  */
 
-//include <cstring>
 #include "common/std/algorithm.h"
 #include "ags/shared/util/buffered_stream.h"
 #include "ags/shared/util/stdio_compat.h"
diff --git a/engines/ags/shared/util/memory.h b/engines/ags/shared/util/memory.h
index 6ce13f32c44..dcf731bd25b 100644
--- a/engines/ags/shared/util/memory.h
+++ b/engines/ags/shared/util/memory.h
@@ -28,7 +28,6 @@
 #ifndef AGS_SHARED_UTIL_MEMORY_H
 #define AGS_SHARED_UTIL_MEMORY_H
 
-//include <string.h>
 #include "ags/shared/util/bbop.h"
 #include "ags/shared/util/math.h"
 
diff --git a/engines/ags/shared/util/path.cpp b/engines/ags/shared/util/path.cpp
index 0a9db7106f1..e35c0a1afdd 100644
--- a/engines/ags/shared/util/path.cpp
+++ b/engines/ags/shared/util/path.cpp
@@ -22,7 +22,6 @@
 #include "ags/shared/core/platform.h"
 #if AGS_PLATFORM_OS_WINDOWS
 #define NOMINMAX
-//include <windows.h>
 #endif
 #include "ags/lib/allegro/file.h"
 #include "ags/shared/util/path.h"
diff --git a/engines/ags/shared/util/string.h b/engines/ags/shared/util/string.h
index 0a4f7df94a2..1f47777c236 100644
--- a/engines/ags/shared/util/string.h
+++ b/engines/ags/shared/util/string.h
@@ -45,8 +45,6 @@
 #ifndef AGS_SHARED_UTIL_STRING_H
 #define AGS_SHARED_UTIL_STRING_H
 
-//include <stdarg.h>
-
 #include "common/str.h"
 
 #include "common/std/vector.h"
@@ -361,7 +359,7 @@ public:
 	// characters (space, tabs, CRLF) are removed.
 	// Remove heading and trailing characters from the string
 	void    Trim(char c = 0);
-	// Remove heading characters from the string; 
+	// Remove heading characters from the string;
 	void    TrimLeft(char c = 0);
 	// Remove trailing characters from the string
 	void    TrimRight(char c = 0);
diff --git a/engines/ags/tests/test_file.cpp b/engines/ags/tests/test_file.cpp
index 437f743e840..a753796abcf 100644
--- a/engines/ags/tests/test_file.cpp
+++ b/engines/ags/tests/test_file.cpp
@@ -20,9 +20,7 @@
  */
 
 #include "ags/shared/core/platform.h"
-//#include <string.h>
-//#include "ags/shared/debugging/assert.h"
-// File not present??
+
 #include "common/scummsys.h"
 #include "ags/shared/util/aligned_stream.h"
 #include "ags/shared/util/file.h"
diff --git a/engines/ags/tests/test_sprintf.cpp b/engines/ags/tests/test_sprintf.cpp
index b80c8a497ec..e97a3bc566d 100644
--- a/engines/ags/tests/test_sprintf.cpp
+++ b/engines/ags/tests/test_sprintf.cpp
@@ -20,10 +20,7 @@
  */
 
 #include "ags/shared/core/platform.h"
-//include <string.h>
 #include "ags/shared/ac/game_version.h"
-//#include "ags/shared/debugging/assert.h"
-// File not present??
 #include "common/scummsys.h"
 #include "ags/engine/script/script_api.h"
 #include "ags/engine/script/runtime_script_value.h"


Commit: 6ec2ca4b6f3501ab4ea51b116fe1c583c447ddcb
    https://github.com/scummvm/scummvm/commit/6ec2ca4b6f3501ab4ea51b116fe1c583c447ddcb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T12:43:15+02:00

Commit Message:
BAGEL: Remove system-wide includes

Changed paths:
    engines/bagel/hodjnpodj/crypt/rec.h
    engines/bagel/hodjnpodj/metagame/bgen/bdbgc.cpp


diff --git a/engines/bagel/hodjnpodj/crypt/rec.h b/engines/bagel/hodjnpodj/crypt/rec.h
index b56223a5a3c..5e1a1d0a24b 100644
--- a/engines/bagel/hodjnpodj/crypt/rec.h
+++ b/engines/bagel/hodjnpodj/crypt/rec.h
@@ -23,7 +23,6 @@
 #define HODJNPODJ_CRYPT_REC_H
 
 #include "common/file.h"
-//#include <lzexpand.h>
 
 namespace Bagel {
 namespace HodjNPodj {
diff --git a/engines/bagel/hodjnpodj/metagame/bgen/bdbgc.cpp b/engines/bagel/hodjnpodj/metagame/bgen/bdbgc.cpp
index d2624bac9b7..20d5e5cc465 100644
--- a/engines/bagel/hodjnpodj/metagame/bgen/bdbgc.cpp
+++ b/engines/bagel/hodjnpodj/metagame/bgen/bdbgc.cpp
@@ -328,9 +328,6 @@ int kybrd(void) {
 /* Copyright (C) 1984 by John J. Xenakis Company */
 // Modified by John J. Xenakis for Papyrus
 
-#include <conio.h>
-#include <dos.h>
-
 #define INTKYB 0x16 /* keyboard interrupt code */
 #define QSIZE 100   /* input queue size */
 


Commit: 1bd35c970bb117cea1feb2f898aa2442e508cda9
    https://github.com/scummvm/scummvm/commit/1bd35c970bb117cea1feb2f898aa2442e508cda9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T12:48:39+02:00

Commit Message:
JANITORIAL: GLK: Remove commented out system-wide includes

Changed paths:
    engines/glk/glulx/string.cpp
    engines/glk/tads/tads2/os.h


diff --git a/engines/glk/glulx/string.cpp b/engines/glk/glulx/string.cpp
index c1e5c4e433a..8de461d039f 100644
--- a/engines/glk/glulx/string.cpp
+++ b/engines/glk/glulx/string.cpp
@@ -695,7 +695,6 @@ void Glulx::buildcache(cacheblock_t *cablist, uint nodeaddr, int depth, int mask
 }
 
 #if 0
-#include <stdio.h>
 void Glulx::dumpcache(cacheblock_t *cablist, int count, int indent) {
 	int ix, jx;
 
diff --git a/engines/glk/tads/tads2/os.h b/engines/glk/tads/tads2/os.h
index f570daf004c..0150d689756 100644
--- a/engines/glk/tads/tads2/os.h
+++ b/engines/glk/tads/tads2/os.h
@@ -258,7 +258,6 @@ namespace TADS2 {
  *   definitions below.
  */
 #ifdef OS_PTHREAD_TLS
-#include <pthread.h>
 #define OS_DECL_TLS(typ, varname) pthread_key_t varname
 #define os_tls_create(varname) pthread_key_create(&varname, NULL)
 #define os_tls_delete(varname) pthread_key_delete(varname)


Commit: c5afb448348a5298829172ce4c9e05a83742fc22
    https://github.com/scummvm/scummvm/commit/c5afb448348a5298829172ce4c9e05a83742fc22
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T12:48:59+02:00

Commit Message:
MTROPOLIS: Avoid system-wide include

Changed paths:
    engines/mtropolis/coroutine_protos.h


diff --git a/engines/mtropolis/coroutine_protos.h b/engines/mtropolis/coroutine_protos.h
index 688b9c22b82..e0cc727db2b 100644
--- a/engines/mtropolis/coroutine_protos.h
+++ b/engines/mtropolis/coroutine_protos.h
@@ -22,7 +22,7 @@
 #ifndef MTROPOLIS_COROUTINE_PROTOS_H
 #define MTROPOLIS_COROUTINE_PROTOS_H
 
-#include <stddef.h>
+#include "common/scummsys.h"
 
 namespace MTropolis {
 


Commit: edc81feb85a49fac06bf27b165a49fab4bca559d
    https://github.com/scummvm/scummvm/commit/edc81feb85a49fac06bf27b165a49fab4bca559d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T12:50:29+02:00

Commit Message:
MTROPOLIS: Comment out unused variable

Changed paths:
    engines/mtropolis/plugin/standard.cpp
    engines/mtropolis/plugin/standard.h


diff --git a/engines/mtropolis/plugin/standard.cpp b/engines/mtropolis/plugin/standard.cpp
index bf4e0472e62..98537298736 100644
--- a/engines/mtropolis/plugin/standard.cpp
+++ b/engines/mtropolis/plugin/standard.cpp
@@ -1754,7 +1754,7 @@ const char *NavigateModifier::getDefaultName() const {
 }
 
 OpenTitleModifier::OpenTitleModifier()
-	: _addToReturnList(false){
+	/*: _addToReturnList(false) */ {
 }
 
 OpenTitleModifier::~OpenTitleModifier() {
@@ -1769,7 +1769,7 @@ bool OpenTitleModifier::load(const PlugInModifierLoaderContext &context, const D
 
 	_pathOrUrl = data.pathOrUrl.value.asString;
 
-	_addToReturnList = static_cast<bool>(data.addToReturnList.value.asInt);
+	//_addToReturnList = static_cast<bool>(data.addToReturnList.value.asInt);
 
 	return true;
 }
diff --git a/engines/mtropolis/plugin/standard.h b/engines/mtropolis/plugin/standard.h
index b2913727c0b..945f37697eb 100644
--- a/engines/mtropolis/plugin/standard.h
+++ b/engines/mtropolis/plugin/standard.h
@@ -439,7 +439,7 @@ private:
 
 	Event _executeWhen;
 	Common::String _pathOrUrl;
-	bool _addToReturnList;
+	//bool _addToReturnList;
 };
 
 class OpenAppModifier : public Modifier {
@@ -465,7 +465,7 @@ private:
 
 	Event _executeWhen;
 	Common::String _pathOrUrl;
-	bool _addToReturnList;
+	//bool _addToReturnList;
 };
 
 class StandardPlugIn : public MTropolis::PlugIn {


Commit: ca31362a74bc2e3aa59bcde5e9f09c9185946277
    https://github.com/scummvm/scummvm/commit/ca31362a74bc2e3aa59bcde5e9f09c9185946277
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T12:51:10+02:00

Commit Message:
JANITORIAL: PHOENIXVR: Remove unneeded system-wide include

Changed paths:
    engines/phoenixvr/math.h


diff --git a/engines/phoenixvr/math.h b/engines/phoenixvr/math.h
index 4b0347e0627..82b5b2e59dd 100644
--- a/engines/phoenixvr/math.h
+++ b/engines/phoenixvr/math.h
@@ -22,8 +22,6 @@
 #ifndef PHOENIXVR_MATH_H
 #define PHOENIXVR_MATH_H
 
-#include <math.h>
-
 namespace PhoenixVR {
 static constexpr auto kTau = static_cast<float>(M_PI * 2);
 static constexpr auto kPi = static_cast<float>(M_PI);


Commit: c2f1cf3feeeb8946df62d0a4c97e4b53f13e585d
    https://github.com/scummvm/scummvm/commit/c2f1cf3feeeb8946df62d0a4c97e4b53f13e585d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T12:52:33+02:00

Commit Message:
JANITORIAL: SAGA2: Remove system-wide include

Changed paths:
    engines/saga2/saveload.cpp


diff --git a/engines/saga2/saveload.cpp b/engines/saga2/saveload.cpp
index f69061d6ead..641fc386c51 100644
--- a/engines/saga2/saveload.cpp
+++ b/engines/saga2/saveload.cpp
@@ -566,12 +566,6 @@ void cleanupGameState() {
 	cleanupGlobals();
 }
 
-//#define DEBUG_FILETIME
-
-#ifdef DEBUG_FILETIME
-#include <time.h>
-#endif
-
 void checkRestartGame(const char *exeName) {
 	Common::String saveRestart = g_vm->getSavegameFile(999);
 	g_vm->saveGameState(999, saveRestart, true);


Commit: e75a6da2cc58b5ac7344f6f505578e5df1a13e50
    https://github.com/scummvm/scummvm/commit/e75a6da2cc58b5ac7344f6f505578e5df1a13e50
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T16:00:25+02:00

Commit Message:
TWINE: Remove unnecessary system-wide includes

Changed paths:
    engines/twine/debugger/debug_state.h
    engines/twine/debugger/ringbuffer.h


diff --git a/engines/twine/debugger/debug_state.h b/engines/twine/debugger/debug_state.h
index b99e3123ad9..029df5fdc4d 100644
--- a/engines/twine/debugger/debug_state.h
+++ b/engines/twine/debugger/debug_state.h
@@ -27,7 +27,6 @@
 #include "common/scummsys.h"
 #include "twine/debugger/ringbuffer.h"
 #include "twine/shared.h"
-#include <cstdarg>
 
 namespace TwinE {
 
diff --git a/engines/twine/debugger/ringbuffer.h b/engines/twine/debugger/ringbuffer.h
index 12e23b78319..ccaa46286db 100644
--- a/engines/twine/debugger/ringbuffer.h
+++ b/engines/twine/debugger/ringbuffer.h
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "common/util.h"
-#include <stddef.h>
 
 namespace TwinE {
 


Commit: b7b9317de5c952dd213cecb10110e4740dd99662
    https://github.com/scummvm/scummvm/commit/b7b9317de5c952dd213cecb10110e4740dd99662
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2026-04-10T16:03:24+02:00

Commit Message:
WINTERMUTE: Remove system-wide include

Changed paths:
    engines/wintermute/coll_templ.h


diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index 826c6af06fc..dc1f904515f 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -32,8 +32,6 @@
 
 namespace Wintermute {
 
-#include <new>
-
 /////////////////////////////////////////////////////////////////////////////
 template<class TYPE>
 inline void dcConstructElements(TYPE *pElements, int32 nCount) {

More information about the Scummvm-git-logs mailing list