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/npcs | |
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/npcs')
-rw-r--r-- | engines/titanic/npcs/barbot.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/barbot.h | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/liftbot.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/liftbot.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp index 907d3c0c71..e487dc1ecb 100644 --- a/engines/titanic/npcs/barbot.cpp +++ b/engines/titanic/npcs/barbot.cpp @@ -233,7 +233,7 @@ void CBarbot::load(SimpleFile *file) { CTrueTalkNPC::load(file); } -bool CBarbot::handleEvent(CEnterRoomMsg &msg) { +bool CBarbot::handleMessage(CEnterRoomMsg &msg) { warning("TODO: Barbot::CEnterRoomMsg"); return true; } diff --git a/engines/titanic/npcs/barbot.h b/engines/titanic/npcs/barbot.h index 442578ef6c..d407ef74c8 100644 --- a/engines/titanic/npcs/barbot.h +++ b/engines/titanic/npcs/barbot.h @@ -174,7 +174,7 @@ private: int _field33C; int _field340; protected: - virtual bool handleEvent(CEnterRoomMsg &msg); + virtual bool handleMessage(CEnterRoomMsg &msg); public: CLASSDEF CBarbot(); diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp index dfc0a4f0ad..a412d43ff1 100644 --- a/engines/titanic/npcs/liftbot.cpp +++ b/engines/titanic/npcs/liftbot.cpp @@ -48,7 +48,7 @@ void CLiftBot::load(SimpleFile *file) { CTrueTalkNPC::load(file); } -bool CLiftBot::handleEvent(CEnterRoomMsg &msg) { +bool CLiftBot::handleMessage(CEnterRoomMsg &msg) { warning("CLiftBot::handleEvent"); return true; } diff --git a/engines/titanic/npcs/liftbot.h b/engines/titanic/npcs/liftbot.h index 3a41bf3a96..373147bdb7 100644 --- a/engines/titanic/npcs/liftbot.h +++ b/engines/titanic/npcs/liftbot.h @@ -35,7 +35,7 @@ private: private: int _field108; protected: - virtual bool handleEvent(CEnterRoomMsg &msg); + virtual bool handleMessage(CEnterRoomMsg &msg); public: CLASSDEF CLiftBot(); |