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

bluegr noreply at scummvm.org
Tue Jun 3 01:05:56 UTC 2025


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

Summary:
7f872286fb COMMON: Remove unused member of the DisposablePtr class
c56d12953a BACKENDS: Fix signed/unsigned mismatch warning
b880e8e5e4 MEDIASTATION: Remove empty switch statements
7a384ce559 PRIVATE: Fix signed/unsigned warnings
af5bd1bef0 PRIVATE: Remove unimplemented function definitions


Commit: 7f872286fb56fcb0d5f1ce2f1a575b491f159234
    https://github.com/scummvm/scummvm/commit/7f872286fb56fcb0d5f1ce2f1a575b491f159234
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-06-03T03:49:19+03:00

Commit Message:
COMMON: Remove unused member of the DisposablePtr class

Changed paths:
    common/ptr.h


diff --git a/common/ptr.h b/common/ptr.h
index 4212a426c60..a33edcb1107 100644
--- a/common/ptr.h
+++ b/common/ptr.h
@@ -731,7 +731,6 @@ private:
 	PointerType           _pointer;
 	DisposeAfterUse::Flag _dispose;
 	SharedPtr<T>          _shared;
-	bool                  _isvalid;
 };
 
 


Commit: c56d12953a25b0c361275676e29a87080a97f526
    https://github.com/scummvm/scummvm/commit/c56d12953a25b0c361275676e29a87080a97f526
Author: Bob Pulliam (bpulliam at gmail.com)
Date: 2025-06-03T03:58:38+03:00

Commit Message:
BACKENDS: Fix signed/unsigned mismatch warning

Changed paths:
    backends/networking/curl/socket.cpp


diff --git a/backends/networking/curl/socket.cpp b/backends/networking/curl/socket.cpp
index 164b15da147..ce5809af46f 100644
--- a/backends/networking/curl/socket.cpp
+++ b/backends/networking/curl/socket.cpp
@@ -123,7 +123,7 @@ bool CurlSocket::connect(const Common::String &url) {
 
 size_t CurlSocket::send(const char *data, int len) {
 	if (!_socket)
-		return -1;
+		return (size_t)-1;
 
 	size_t nsent_total = 0, left = len;
 	CURLcode res = CURLE_AGAIN;


Commit: b880e8e5e46d450c8599a2d7d83603667614da14
    https://github.com/scummvm/scummvm/commit/b880e8e5e46d450c8599a2d7d83603667614da14
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-06-03T04:02:49+03:00

Commit Message:
MEDIASTATION: Remove empty switch statements

Changed paths:
    engines/mediastation/assets/palette.cpp
    engines/mediastation/assets/screen.cpp


diff --git a/engines/mediastation/assets/palette.cpp b/engines/mediastation/assets/palette.cpp
index c3d09005700..d8b00ce04e8 100644
--- a/engines/mediastation/assets/palette.cpp
+++ b/engines/mediastation/assets/palette.cpp
@@ -26,10 +26,7 @@
 namespace MediaStation {
 
 ScriptValue Palette::callMethod(BuiltInMethod methodId, Common::Array<ScriptValue> &args) {
-	switch (methodId) {
-	default:
-		error("Palette::callMethod(): Got unimplemented method ID %s (%d)", builtInMethodToStr(methodId), static_cast<uint>(methodId));
-	}
+	error("Palette::callMethod(): Got unimplemented method ID %s (%d)", builtInMethodToStr(methodId), static_cast<uint>(methodId));
 }
 
 } // End of namespace MediaStation
diff --git a/engines/mediastation/assets/screen.cpp b/engines/mediastation/assets/screen.cpp
index 5c05cba4251..13238178b09 100644
--- a/engines/mediastation/assets/screen.cpp
+++ b/engines/mediastation/assets/screen.cpp
@@ -25,10 +25,7 @@
 namespace MediaStation {
 
 ScriptValue Screen::callMethod(BuiltInMethod methodId, Common::Array<ScriptValue> &args) {
-	switch (methodId) {
-	default:
-		error("Screen::callMethod(): Got unimplemented method ID %s (%d)", builtInMethodToStr(methodId), static_cast<uint>(methodId));
-	}
+	error("Screen::callMethod(): Got unimplemented method ID %s (%d)", builtInMethodToStr(methodId), static_cast<uint>(methodId));
 }
 
 } // End of namespace MediaStation


Commit: 7a384ce5598b2e0925669ab34ba4aeef7eb6d2b3
    https://github.com/scummvm/scummvm/commit/7a384ce5598b2e0925669ab34ba4aeef7eb6d2b3
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-06-03T04:04:03+03:00

Commit Message:
PRIVATE: Fix signed/unsigned warnings

Changed paths:
    engines/private/funcs.cpp
    engines/private/private.h


diff --git a/engines/private/funcs.cpp b/engines/private/funcs.cpp
index 64d1208b7e5..9e0b1775944 100644
--- a/engines/private/funcs.cpp
+++ b/engines/private/funcs.cpp
@@ -120,7 +120,7 @@ static void fDiaryPageTurn(ArgArray args) {
 	if (args[0].u.val == 1) {
 		e.cursor = "kTurnRight";
 
-		if (g_private->_currentDiaryPage == g_private->_diaryPages.size() - 1) {
+		if ((uint)g_private->_currentDiaryPage == g_private->_diaryPages.size() - 1) {
 			e.nextSetting = "kDiaryLastPage";
 		}
 
diff --git a/engines/private/private.h b/engines/private/private.h
index 9b47861ef62..7a7b6ada5d0 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -299,7 +299,7 @@ public:
 	void loadInventory(uint32, const Common::Rect &, const Common::Rect &);
 	bool _toTake;
 	DiaryPages _diaryPages;
-	uint _currentDiaryPage;
+	int _currentDiaryPage;
 	ExitInfo _diaryNextPageExit;
 	ExitInfo _diaryPrevPageExit;
 	bool selectDiaryNextPage(Common::Point mousePos);


Commit: af5bd1bef07b47f3f2996295ac6b0ffd98b7542c
    https://github.com/scummvm/scummvm/commit/af5bd1bef07b47f3f2996295ac6b0ffd98b7542c
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2025-06-03T04:05:26+03:00

Commit Message:
PRIVATE: Remove unimplemented function definitions

Changed paths:
    engines/private/private.h


diff --git a/engines/private/private.h b/engines/private/private.h
index 7a7b6ada5d0..9bf86674e13 100644
--- a/engines/private/private.h
+++ b/engines/private/private.h
@@ -213,7 +213,6 @@ public:
 	void ignoreEvents();
 	Common::Error loadGameStream(Common::SeekableReadStream *stream) override;
 	Common::Error saveGameStream(Common::WriteStream *stream, bool isAutosave = false) override;
-	void syncGameStream(Common::Serializer &s);
 
 	Common::Path convertPath(const Common::String &);
 	void playVideo(const Common::String &);
@@ -283,7 +282,6 @@ public:
 	void loadDossier();
 
 	// Police Bust
-	void policeBust();
 	bool _policeBustEnabled;
 	void startPoliceBust();
 	void checkPoliceBust();




More information about the Scummvm-git-logs mailing list