From 972e7d65f4cebb07e1724b96543f6b0d25f78360 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 3 Sep 2016 18:23:02 -0400
Subject: TITANIC: Fix message targets when changing views

---
 engines/titanic/core/view_item.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index af23fca027..176765b12f 100644
--- a/engines/titanic/core/view_item.cpp
+++ b/engines/titanic/core/view_item.cpp
@@ -115,19 +115,19 @@ void CViewItem::preEnterView(CViewItem *newView) {
 	// Only do the processing if we've been passed a view, and it's not the same 
 	if (newView && newView != this) {
 		CPreEnterViewMsg viewMsg(this, newView);
-		viewMsg.execute(this, nullptr, MSGFLAG_SCAN);
+		viewMsg.execute(newView, nullptr, MSGFLAG_SCAN);
 
 		CNodeItem *oldNode = findNode();
 		CNodeItem *newNode = newView->findNode();
 		if (newNode != oldNode) {
 			CPreEnterNodeMsg nodeMsg(oldNode, newNode);
-			nodeMsg.execute(oldNode, nullptr, MSGFLAG_SCAN);
+			nodeMsg.execute(newNode, nullptr, MSGFLAG_SCAN);
 
 			CRoomItem *oldRoom = oldNode->findRoom();
 			CRoomItem *newRoom = newNode->findRoom();
 			if (newRoom != oldRoom) {
 				CPreEnterRoomMsg roomMsg(oldRoom, newRoom);
-				roomMsg.execute(oldRoom, nullptr, MSGFLAG_SCAN);
+				roomMsg.execute(newRoom, nullptr, MSGFLAG_SCAN);
 			}
 		}
 	}
@@ -137,13 +137,13 @@ void CViewItem::enterView(CViewItem *newView) {
 	// Only do the processing if we've been passed a view, and it's not the same 
 	if (newView && newView != this) {
 		CEnterViewMsg viewMsg(this, newView);
-		viewMsg.execute(this, nullptr, MSGFLAG_SCAN);
+		viewMsg.execute(newView, nullptr, MSGFLAG_SCAN);
 
 		CNodeItem *oldNode = findNode();
 		CNodeItem *newNode = newView->findNode();
 		if (newNode != oldNode) {
 			CEnterNodeMsg nodeMsg(oldNode, newNode);
-			nodeMsg.execute(oldNode, nullptr, MSGFLAG_SCAN);
+			nodeMsg.execute(newNode, nullptr, MSGFLAG_SCAN);
 
 			CRoomItem *oldRoom = oldNode->findRoom();
 			CRoomItem *newRoom = newNode->findRoom();
@@ -157,7 +157,7 @@ void CViewItem::enterView(CViewItem *newView) {
 
 			if (newRoom != oldRoom) {
 				CEnterRoomMsg roomMsg(oldRoom, newRoom);
-				roomMsg.execute(oldRoom, nullptr, MSGFLAG_SCAN);
+				roomMsg.execute(newRoom, nullptr, MSGFLAG_SCAN);
 
 				if (petControl)
 					petControl->enterRoom(newRoom);
-- 
cgit v1.2.3