[Scummvm-git-logs] scummvm master -> 85a13bc7a6abf39a1e920624735013e261ace921

[bluegr]

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

Summary:
85a13bc7a6 TRECISION: Fix the elevator button and Ruby's reader closeups voiceover


Commit: 85a13bc7a6abf39a1e920624735013e261ace921
    https://github.com/scummvm/scummvm/commit/85a13bc7a6abf39a1e920624735013e261ace921
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-05-30T18:18:43+03:00

Commit Message:
TRECISION: Fix the elevator button and Ruby's reader closeups voiceover

Changed paths:
    engines/trecision/logic.cpp
    engines/trecision/logic.h


diff --git a/engines/trecision/logic.cpp b/engines/trecision/logic.cpp
index 908f68824b..4f04499d40 100644
--- a/engines/trecision/logic.cpp
+++ b/engines/trecision/logic.cpp
@@ -57,8 +57,6 @@ LogicManager::LogicManager(TrecisionEngine *vm) : _vm(vm) {
 
 	_slotMachine41Counter = 0;
 
-	_closeUpObj = 0;
-
 	initInventory();
 }
 LogicManager::~LogicManager() {}
@@ -467,9 +465,13 @@ void LogicManager::endChangeRoom() {
 	if (_vm->_curRoom == kRoom17 && (_vm->_oldRoom == kRoom18) && !_vm->_room[kRoom17].isDone() && _vm->isObjectVisible(oRETE17))
 		_vm->_textMgr->characterSay(189);
 
-	if ((_vm->_curRoom == kRoom12CU || _vm->_curRoom == kRoom13CU) && _closeUpObj && _vm->_obj[_closeUpObj]._examine)
-		_vm->_textMgr->characterSay(_vm->_obj[_closeUpObj]._examine);
-	else if (_vm->_curRoom == kRoom23A && (_vm->_oldRoom == kRoom21) && !_vm->_room[kRoom23A].isDone()) {
+	if (_vm->_curRoom == kRoom12CU) {
+		const uint16 closeupObjectId = _vm->isObjectVisible(oFUSIBILE12) ? oFUSIBILE12 : oPANELA12;
+		_vm->_textMgr->characterSay(_vm->_obj[closeupObjectId]._examine);
+	} else if (_vm->_curRoom == kRoom13CU) {
+		const uint16 closeupObjectId = _vm->isObjectVisible(oLETTERA13) ? oLETTERA13 : oPENPADA13;
+		_vm->_textMgr->characterSay(_vm->_obj[closeupObjectId]._examine);
+	}  else if (_vm->_curRoom == kRoom23A && (_vm->_oldRoom == kRoom21) && !_vm->_room[kRoom23A].isDone()) {
 		_vm->_flagShowCharacter = true;
 		_vm->startCharacterAction(aWALKIN, 0, 0, 361);
 	} else if (_vm->_curRoom == kRoom24 && !_vm->_room[kRoom24].isDone())
@@ -2003,22 +2005,14 @@ bool LogicManager::mouseExamine(uint16 curObj) {
 
 	case oPANELA12:
 	case oFUSIBILE12:
-		if (_vm->isObjectVisible(oFUSIBILE12))
-			_vm->setObjectVisible(oFUSE12CU, true);
-		else
-			_vm->setObjectVisible(oFUSE12CU, false);
+		_vm->setObjectVisible(oFUSE12CU, _vm->isObjectVisible(oFUSIBILE12));
 		_vm->changeRoom(kRoom12CU);
-		_closeUpObj = curObj;
 		break;
 
 	case oLETTERA13:
 	case oPENPADA13:
-		if (_vm->isObjectVisible(oLETTERA13))
-			_vm->setObjectVisible(oLETTER13CU, true);
-		else
-			_vm->setObjectVisible(oLETTER13CU, false);
+		_vm->setObjectVisible(oLETTER13CU, _vm->isObjectVisible(oLETTERA13));
 		_vm->changeRoom(kRoom13CU);
-		_closeUpObj = curObj;
 		break;
 
 	case oCUCININO14:
diff --git a/engines/trecision/logic.h b/engines/trecision/logic.h
index 7e2b324b00..d311979dc2 100644
--- a/engines/trecision/logic.h
+++ b/engines/trecision/logic.h
@@ -53,9 +53,6 @@ class LogicManager {
 	uint16 _wheel;
 	uint16 _wheelPos[3];
 
-	// CloseUp12 and 13
-	uint16 _closeUpObj;
-
 	void initInventory();
 
 public: