[Scummvm-git-logs] scummvm master -> 18779bb1567fce213de24d2582b329b923947baa

[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:
18779bb156 TRECISION: Fix room snapshots in the positioner interface - bug #12638


Commit: 18779bb1567fce213de24d2582b329b923947baa
    https://github.com/scummvm/scummvm/commit/18779bb1567fce213de24d2582b329b923947baa
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2021-06-16T02:37:44+03:00

Commit Message:
TRECISION: Fix room snapshots in the positioner interface - bug #12638

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


diff --git a/engines/trecision/logic.cpp b/engines/trecision/logic.cpp
index fff427ca09..b5fe573f24 100644
--- a/engines/trecision/logic.cpp
+++ b/engines/trecision/logic.cpp
@@ -349,8 +349,6 @@ bool LogicManager::startPlayDialog() {
 	} else if (_vm->_curRoom == kRoom4A && (_vm->_oldRoom == kRoom49) && !_vm->_inventoryObj[kItemPositioner].isFlagExtra()) {
 		_vm->_dialogMgr->playDialog(dF491);
 	} else if (_vm->_curRoom == kRoom4A && (_vm->_oldRoom == kRoom41D) && _vm->_inventoryObj[kItemPositioner].isFlagExtra() && _vm->isObjectVisible(ocHELLEN4A)) {
-		if (_vm->_curRoom == kRoom41D)
-			_vm->readExtraObj41D();
 		_vm->_dialogMgr->playDialog(dC4A1);
 	} else if (_vm->_curRoom == kRoom4P && (_vm->_oldRoom == kRoom4O) && !_vm->_room[kRoom4P].isDone()) {
 		_vm->_dialogMgr->playDialog(dF4PI);
@@ -488,6 +486,10 @@ void LogicManager::endChangeRoom() {
 		_vm->_textMgr->characterSay(1408);
 	else if (_vm->_curRoom == kRoomControlPanel && (_vm->_oldRoom == kRoomControlPanel))
 		_vm->_logicMgr->handleClickControlPanel(o00LOAD);
+
+	if (_vm->_curRoom == kRoom41D)
+		_vm->readPositionerSnapshots();
+
 	_vm->_inventoryObj[kItemPositioner].setFlagExtra(false);
 }
 
diff --git a/engines/trecision/resource.cpp b/engines/trecision/resource.cpp
index dfbff39981..a7bef58e7d 100644
--- a/engines/trecision/resource.cpp
+++ b/engines/trecision/resource.cpp
@@ -210,7 +210,7 @@ void TrecisionEngine::readExtraObj2C() {
 	delete ff;
 }
 
-void TrecisionEngine::readExtraObj41D() {
+void TrecisionEngine::readPositionerSnapshots() {
 	if (!_room[_curRoom]._object[32])
 		return;
 
diff --git a/engines/trecision/trecision.h b/engines/trecision/trecision.h
index a4939b9fa3..b9839d0d70 100644
--- a/engines/trecision/trecision.h
+++ b/engines/trecision/trecision.h
@@ -223,7 +223,7 @@ public:
 	void readLoc();
 	void tendIn();
 	void readExtraObj2C();
-	void readExtraObj41D();
+	void readPositionerSnapshots();
 
 	// Data files
 	byte *readData(const Common::String &fileName);