From 24d791ba76da4b46cbc5a01d939e248ab19941db Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 11 Jun 2021 23:18:55 +0300 Subject: [PATCH] TRECISION: Remove superfluous inventory state variables --- engines/trecision/saveload.cpp | 1 - engines/trecision/script.cpp | 2 -- engines/trecision/trecision.cpp | 3 --- engines/trecision/trecision.h | 6 +++--- engines/trecision/utils.cpp | 8 +------- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/engines/trecision/saveload.cpp b/engines/trecision/saveload.cpp index a108afd603a..0c691d2f282 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 7e016afd6c1..dacccbb6f6e 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 bc0e409bffd..6b4cf625b6c 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 42f246c9148..50c5307744e 100644 --- a/engines/trecision/trecision.h +++ b/engines/trecision/trecision.h @@ -251,9 +251,9 @@ public: Common::Array _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 6d3ba63c13f..1efbea3f7e0 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();