libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-23 11:04:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Fix message targets when changing views

Browse Source
This commit is contained in:
Paul Gilbert 2016-09-03 18:23:02 -04:00
parent 848c5c3f84
commit 972e7d65f4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engines/titanic/core/view_item.cpp
View File

@ -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);