[Scummvm-git-logs] scummvm master -> 4d63ba430ebe8c7bfd9211d1f6192af2e3e52c9e

[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:
4d63ba430e WINTERMUTE: Handle delta between full and lite version in ad_game


Commit: 4d63ba430ebe8c7bfd9211d1f6192af2e3e52c9e
    https://github.com/scummvm/scummvm/commit/4d63ba430ebe8c7bfd9211d1f6192af2e3e52c9e
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-07-22T23:32:37+02:00

Commit Message:
WINTERMUTE: Handle delta between full and lite version in ad_game

Changed paths:
    engines/wintermute/ad/ad_game.cpp


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 9b9a18b7e7b..90ef87bb298 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -247,6 +247,12 @@ bool AdGame::addObject(AdObject *object) {
 
 //////////////////////////////////////////////////////////////////////////
 bool AdGame::removeObject(AdObject *object) {
+	if (BaseEngine::instance().getTargetExecutable() < WME_LITE) {
+		// is it inventory object?
+		if (_inventoryOwner == object)
+			_inventoryOwner = nullptr;
+	}
+
 	// in case the user called Scene.CreateXXX() and Game.DeleteXXX()
 	if (_scene) {
 		bool res = _scene->removeObject(object);
@@ -534,7 +540,7 @@ bool AdGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 
 		AdItem *item = nullptr;
 		if (val->isInt()) {
-			int index = val->getInt();
+			int32 index = val->getInt();
 			if (index >= 0 && index < (int32)_items.getSize()) {
 				item = _items[index];
 			}
@@ -1302,8 +1308,10 @@ bool AdGame::externalCall(ScScript *script, ScStack *stack, ScStack *thisStack,
 
 //////////////////////////////////////////////////////////////////////////
 bool AdGame::showCursor() {
-	if (_cursorHidden) {
-		return STATUS_OK;
+	if (BaseEngine::instance().getTargetExecutable() == WME_LITE) {
+		if (_cursorHidden) {
+			return STATUS_OK;
+		}
 	}
 
 	if (_selectedItem && _gameRef->_state == GAME_RUNNING && _stateEx == GAME_NORMAL && _interactive) {
@@ -1931,7 +1939,7 @@ bool AdGame::endDlgBranch(const char *branchName, const char *scriptName, const
 
 
 	int startIndex = -1;
-	for (int i = _dlgPendingBranches.getSize() - 1; i >= 0; i--) {
+	for (int32 i = (int32)_dlgPendingBranches.getSize() - 1; i >= 0; i--) {
 		if (scumm_stricmp(name, _dlgPendingBranches[i]) == 0) {
 			startIndex = i;
 			break;