[Scummvm-git-logs] scummvm master -> 24d791ba76da4b46cbc5a01d939e248ab19941db

[bluegr]

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

Summary:
a8882c9478 TRECISION: Fix Joshua's action after combining inventory items
24d791ba76 TRECISION: Remove superfluous inventory state variables


Commit: a8882c9478b9c4b06e510bfac365c81fee1d27de
    https://github.com/scummvm/scummvm/commit/a8882c9478b9c4b06e510bfac365c81fee1d27de
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-06-11T23:19:11+03:00

Commit Message:
TRECISION: Fix Joshua's action after combining inventory items

A regression from d334bb3cb84e1cb454a637103848d1ba1e328e5f

Changed paths:
    engines/trecision/logic.cpp


diff --git a/engines/trecision/logic.cpp b/engines/trecision/logic.cpp
index 526b17bb5a..64560231a7 100644
--- a/engines/trecision/logic.cpp
+++ b/engines/trecision/logic.cpp
@@ -780,7 +780,7 @@ void LogicManager::useInventoryWithInventory() {
 		break;
 	}
 
-	if (itemUsed)
+	if (!itemUsed)
 		_vm->_textMgr->characterSay(_vm->_inventoryObj[_vm->_useWith[USED]]._action);
 	else
 		_vm->setInventoryStart(_vm->_iconBase, INVENTORY_SHOW);


Commit: 24d791ba76da4b46cbc5a01d939e248ab19941db
    https://github.com/scummvm/scummvm/commit/24d791ba76da4b46cbc5a01d939e248ab19941db
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-06-11T23:19:12+03:00

Commit Message:
TRECISION: Remove superfluous inventory state variables

Changed paths:
    engines/trecision/saveload.cpp
    engines/trecision/script.cpp
    engines/trecision/trecision.cpp
    engines/trecision/trecision.h
    engines/trecision/utils.cpp


diff --git a/engines/trecision/saveload.cpp b/engines/trecision/saveload.cpp
index a108afd603..0c691d2f28 100644
--- a/engines/trecision/saveload.cpp
+++ b/engines/trecision/saveload.cpp
@@ -49,7 +49,6 @@ void TrecisionEngine::loadSaveSlots(Common::StringArray &saveNames) {
 		}
 	}
 
-	_inventoryRefreshStartIconOld = _inventoryRefreshStartLineOld = _lightIconOld = 0xFF;
 	refreshInventory(0, 0);
 }
 
diff --git a/engines/trecision/script.cpp b/engines/trecision/script.cpp
index 7e016afd6c..dacccbb6f6 100644
--- a/engines/trecision/script.cpp
+++ b/engines/trecision/script.cpp
@@ -440,7 +440,6 @@ void TrecisionEngine::doIdle() {
 			dataSave();
 			showInventoryName(NO_OBJECTS, false);
 			showIconName();
-			_inventoryRefreshStartIconOld = _inventoryRefreshStartLineOld = _lightIconOld = 0xFF;
 			refreshInventory(_inventoryRefreshStartIcon, _inventoryRefreshStartLine);
 		}
 		break;
@@ -452,7 +451,6 @@ void TrecisionEngine::doIdle() {
 			if (!dataLoad()) {
 				showInventoryName(NO_OBJECTS, false);
 				showIconName();
-				_inventoryRefreshStartIconOld = _inventoryRefreshStartLineOld = _lightIconOld = 0xFF;
 				refreshInventory(_inventoryRefreshStartIcon, _inventoryRefreshStartLine);
 			}
 		}
diff --git a/engines/trecision/trecision.cpp b/engines/trecision/trecision.cpp
index bc0e409bff..6b4cf625b6 100644
--- a/engines/trecision/trecision.cpp
+++ b/engines/trecision/trecision.cpp
@@ -72,12 +72,9 @@ TrecisionEngine::TrecisionEngine(OSystem *syst, const ADGameDescription *desc) :
 
 	_iconBase = 0;
 	_inventoryRefreshStartIcon = 0;
-	_inventoryRefreshStartIconOld = 0xFF;
 	_curObj = 1;
 	_inventoryRefreshStartLine = INVENTORY_HIDE;
-	_inventoryRefreshStartLineOld = 0xFF;
 	_lightIcon = 0xFF;
-	_lightIconOld = 0xFF;
 	_inventoryStatus = INV_OFF;
 	_inventoryCounter = INVENTORY_HIDE;	
 	_flagInventoryLocked = false;
diff --git a/engines/trecision/trecision.h b/engines/trecision/trecision.h
index 42f246c914..50c5307744 100644
--- a/engines/trecision/trecision.h
+++ b/engines/trecision/trecision.h
@@ -251,9 +251,9 @@ public:
 	Common::Array<byte> _cyberInventory;
 	uint8 _iconBase;
 	uint8 _inventoryStatus;
-	uint8 _lightIcon, _lightIconOld;
-	uint8 _inventoryRefreshStartIcon, _inventoryRefreshStartIconOld;
-	uint8 _inventoryRefreshStartLine, _inventoryRefreshStartLineOld;
+	uint8 _lightIcon;
+	uint8 _inventoryRefreshStartIcon;
+	uint8 _inventoryRefreshStartLine;
 	int16 _inventoryCounter;
 	bool  _flagInventoryLocked;
 	int16 _inventorySpeed[8];
diff --git a/engines/trecision/utils.cpp b/engines/trecision/utils.cpp
index 6d3ba63c13..1efbea3f7e 100644
--- a/engines/trecision/utils.cpp
+++ b/engines/trecision/utils.cpp
@@ -195,14 +195,8 @@ void TrecisionEngine::processTime() {
 		if (_inventoryStatus == INV_PAINT || _inventoryStatus == INV_DEPAINT)
 			rollInventory(_inventoryStatus);
 
-		if (_inventoryStatus != INV_OFF && (
-			_inventoryRefreshStartIconOld != _inventoryRefreshStartIcon ||
-			_inventoryRefreshStartLineOld != _inventoryRefreshStartLine ||
-			_lightIconOld != _lightIcon)) {
+		if (_inventoryStatus != INV_OFF) {
 			refreshInventory(_inventoryRefreshStartIcon, _inventoryRefreshStartLine);
-			_inventoryRefreshStartIconOld = _inventoryRefreshStartIcon;
-			_inventoryRefreshStartLineOld = _inventoryRefreshStartLine;
-			_lightIconOld = _lightIcon;
 		}
 
 		_textMgr->drawTexts();