diff options
author | Paul Gilbert | 2016-03-24 07:49:59 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-03-24 07:49:59 -0400 |
commit | 66e198d665a8aacd1724848a40e6533f3d5cfebc (patch) | |
tree | 549c1414ea83683eb9c75ba5eea7d3d07733009a /engines/titanic/game/pet | |
parent | 2f532c086d5cd466a54763fc4fee14d0940e0abb (diff) | |
download | scummvm-rg350-66e198d665a8aacd1724848a40e6533f3d5cfebc.tar.gz scummvm-rg350-66e198d665a8aacd1724848a40e6533f3d5cfebc.tar.bz2 scummvm-rg350-66e198d665a8aacd1724848a40e6533f3d5cfebc.zip |
TITANIC: Cleanup and fixes for message hierarchy
Diffstat (limited to 'engines/titanic/game/pet')
-rw-r--r-- | engines/titanic/game/pet/pet_monitor.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/game/pet/pet_monitor.h | 2 | ||||
-rw-r--r-- | engines/titanic/game/pet/pet_position.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/game/pet/pet_position.h | 2 | ||||
-rw-r--r-- | engines/titanic/game/pet/pet_transport.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/game/pet/pet_transport.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/game/pet/pet_monitor.cpp b/engines/titanic/game/pet/pet_monitor.cpp index 44d24f264e..afe0836e65 100644 --- a/engines/titanic/game/pet/pet_monitor.cpp +++ b/engines/titanic/game/pet/pet_monitor.cpp @@ -34,7 +34,7 @@ void CPETMonitor::load(SimpleFile *file) { CGameObject::load(file); } -bool CPETMonitor::handleEvent(CEnterRoomMsg &msg) { +bool CPETMonitor::handleMessage(CEnterRoomMsg &msg) { warning("CPETMonitor::handleEvent"); return true; } diff --git a/engines/titanic/game/pet/pet_monitor.h b/engines/titanic/game/pet/pet_monitor.h index 1d66a58d29..f8a35292fa 100644 --- a/engines/titanic/game/pet/pet_monitor.h +++ b/engines/titanic/game/pet/pet_monitor.h @@ -30,7 +30,7 @@ namespace Titanic { class CPETMonitor : public CGameObject, CEnterRoomMsgTarget { protected: - virtual bool handleEvent(CEnterRoomMsg &msg); + virtual bool handleMessage(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/pet/pet_position.cpp b/engines/titanic/game/pet/pet_position.cpp index b25111f62c..e1dab2218f 100644 --- a/engines/titanic/game/pet/pet_position.cpp +++ b/engines/titanic/game/pet/pet_position.cpp @@ -34,7 +34,7 @@ void CPETPosition::load(SimpleFile *file) { CGameObject::load(file); } -bool CPETPosition::handleEvent(CEnterRoomMsg &msg) { +bool CPETPosition::handleMessage(CEnterRoomMsg &msg) { warning("CPETPosition::handleEvent"); return true; } diff --git a/engines/titanic/game/pet/pet_position.h b/engines/titanic/game/pet/pet_position.h index 8a0623932b..fe28a13777 100644 --- a/engines/titanic/game/pet/pet_position.h +++ b/engines/titanic/game/pet/pet_position.h @@ -30,7 +30,7 @@ namespace Titanic { class CPETPosition : public CGameObject, CEnterRoomMsgTarget { protected: - virtual bool handleEvent(CEnterRoomMsg &msg); + virtual bool handleMessage(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/pet/pet_transport.cpp b/engines/titanic/game/pet/pet_transport.cpp index a88b703b10..36685676ac 100644 --- a/engines/titanic/game/pet/pet_transport.cpp +++ b/engines/titanic/game/pet/pet_transport.cpp @@ -34,7 +34,7 @@ void CPETTransport::load(SimpleFile *file) { CGameObject::load(file); } -bool CPETTransport::handleEvent(CEnterRoomMsg &msg) { +bool CPETTransport::handleMessage(CEnterRoomMsg &msg) { warning("CPETTransport::handleEvent"); return true; } diff --git a/engines/titanic/game/pet/pet_transport.h b/engines/titanic/game/pet/pet_transport.h index 3dc856d5b2..e43cbef849 100644 --- a/engines/titanic/game/pet/pet_transport.h +++ b/engines/titanic/game/pet/pet_transport.h @@ -30,7 +30,7 @@ namespace Titanic { class CPETTransport : public CGameObject, CEnterRoomMsgTarget { protected: - virtual bool handleEvent(CEnterRoomMsg &msg); + virtual bool handleMessage(CEnterRoomMsg &msg); public: CLASSDEF |