[Scummvm-git-logs] scummvm master -> 972e7d65f4cebb07e1724b96543f6b0d25f78360

[dreammaster]

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:
972e7d65f4 TITANIC: Fix message targets when changing views


Commit: 972e7d65f4cebb07e1724b96543f6b0d25f78360
    https://github.com/scummvm/scummvm/commit/972e7d65f4cebb07e1724b96543f6b0d25f78360
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-03T18:23:02-04:00

Commit Message:
TITANIC: Fix message targets when changing views

Changed paths:
    engines/titanic/core/view_item.cpp



diff --git a/engines/titanic/core/view_item.cpp b/engines/titanic/core/view_item.cpp
index af23fca..176765b 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);