From 9bfc24eee3f724fab4aadad17d6c4664682f7aa3 Mon Sep 17 00:00:00 2001
From: Le Philousophe
Date: Thu, 21 Mar 2019 07:55:55 +0100
Subject: CRYOMNI3D: Deselect object when removing from inventory

---
 engines/cryomni3d/objects.cpp            | 2 ++
 engines/cryomni3d/versailles/dialogs.cpp | 1 -
 engines/cryomni3d/versailles/logic.cpp   | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/cryomni3d')

diff --git a/engines/cryomni3d/objects.cpp b/engines/cryomni3d/objects.cpp
index 1c06eb1ea1..5d79c5f56c 100644
--- a/engines/cryomni3d/objects.cpp
+++ b/engines/cryomni3d/objects.cpp
@@ -69,6 +69,7 @@ void Inventory::remove(unsigned int position) {
 void Inventory::removeByIconID(unsigned int iconID) {
 	for (iterator it = begin(); it != end(); it++) {
 		if ((*it) && (*it)->idCA() == iconID) {
+			deselectObject();
 			remove(it - begin());
 			return;
 		}
@@ -79,6 +80,7 @@ void Inventory::removeByIconID(unsigned int iconID) {
 void Inventory::removeByNameID(unsigned int nameID) {
 	for (iterator it = begin(); it != end(); it++) {
 		if ((*it) && (*it)->idOBJ() == nameID) {
+			deselectObject();
 			remove(it - begin());
 			return;
 		}
diff --git a/engines/cryomni3d/versailles/dialogs.cpp b/engines/cryomni3d/versailles/dialogs.cpp
index b74e2f0a39..ed5921397b 100644
--- a/engines/cryomni3d/versailles/dialogs.cpp
+++ b/engines/cryomni3d/versailles/dialogs.cpp
@@ -294,7 +294,6 @@ void CryOmni3DEngine_Versailles::dialogShowBontempsGivesKey() {
 void CryOmni3DEngine_Versailles::dialogShowDuMaineLeaves() {
 	playInGameVideo("62S_DUC1");
 	_inventory.removeByNameID(144);
-	_inventory.deselectObject();
 	setPlaceState(19, 1);
 }
 
diff --git a/engines/cryomni3d/versailles/logic.cpp b/engines/cryomni3d/versailles/logic.cpp
index e824031539..f898778004 100644
--- a/engines/cryomni3d/versailles/logic.cpp
+++ b/engines/cryomni3d/versailles/logic.cpp
@@ -1314,7 +1314,6 @@ FILTER_EVENT(2, 1) {
 
 		if (idOBJ == 98 && _dialogsMan["JOUEUR-CONFIE-MESSAGE-HUISSIER"] == 'Y') {
 			_inventory.removeByNameID(98);
-			_inventory.deselectObject();
 			setGameTime(2, 2);
 		}
 	} else if (*event == 31101) {
-- 
cgit v1.2.3