[Scummvm-git-logs] scummvm master -> 7d5ba1e3a601cc9f75af722953318f9cb0e48717

[aquadran]

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

Summary:
7d5ba1e3a6 WINTERMUTE: Avoid clashing 'Platform' opcode with game script


Commit: 7d5ba1e3a601cc9f75af722953318f9cb0e48717
    https://github.com/scummvm/scummvm/commit/7d5ba1e3a601cc9f75af722953318f9cb0e48717
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2026-01-31T19:00:21+01:00

Commit Message:
WINTERMUTE: Avoid clashing 'Platform' opcode with game script

Changed paths:
    engines/wintermute/base/base_game.cpp


diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index cc435c3fee5..e6a2bdf547f 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -3407,7 +3407,8 @@ ScValue *BaseGame::scGetProperty(const char *name) {
 	//////////////////////////////////////////////////////////////////////////
 	// Platform (RO)
 	//////////////////////////////////////////////////////////////////////////
-	else if (strcmp(name, "Platform") == 0) {
+	else if (strcmp(name, "Platform") == 0 &&
+			 BaseEngine::instance().getGameId() != "royalmahjong") { // avoid clashing
 		_scValue->setString(BasePlatform::getPlatformName().c_str());
 		return _scValue;
 	}