diff options
author | Paul Gilbert | 2016-04-07 22:03:35 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-04-07 22:03:35 -0400 |
commit | 9f1bab55972b8a6f88b83c2391c40a038ffb509d (patch) | |
tree | f56c6af8d5606cba208b1663662597ff3861a356 /engines/titanic/game/gondolier | |
parent | 41c08d186adc91111e9beccfeef80efb3fcc0fd6 (diff) | |
download | scummvm-rg350-9f1bab55972b8a6f88b83c2391c40a038ffb509d.tar.gz scummvm-rg350-9f1bab55972b8a6f88b83c2391c40a038ffb509d.tar.bz2 scummvm-rg350-9f1bab55972b8a6f88b83c2391c40a038ffb509d.zip |
TITANIC: Converting other message stubs to new format
Diffstat (limited to 'engines/titanic/game/gondolier')
-rw-r--r-- | engines/titanic/game/gondolier/gondolier_mixer.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/game/gondolier/gondolier_mixer.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/engines/titanic/game/gondolier/gondolier_mixer.cpp b/engines/titanic/game/gondolier/gondolier_mixer.cpp index 2bd3313d47..76bf2597d9 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.cpp +++ b/engines/titanic/game/gondolier/gondolier_mixer.cpp @@ -57,10 +57,10 @@ void CGondolierMixer::load(SimpleFile *file) { CGondolierBase::load(file); } -bool CGondolierMixer::handleMessage(CEnterRoomMsg &msg) { +bool CGondolierMixer::EnterRoomMsg(CEnterRoomMsg *msg) { CRoomItem *parentRoom = dynamic_cast<CRoomItem *>(getParent()); - if (parentRoom == msg._newRoom) - msg.execute(parentRoom); + if (parentRoom == msg->_newRoom) + msg->execute(parentRoom); return true; } diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h index 1186393d04..2202d24d5f 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.h +++ b/engines/titanic/game/gondolier/gondolier_mixer.h @@ -29,6 +29,7 @@ namespace Titanic { class CGondolierMixer : public CGondolierBase { + bool EnterRoomMsg(CEnterRoomMsg *msg); private: int _fieldBC; int _fieldC0; @@ -37,8 +38,6 @@ private: CString _string1; CString _string2; int _fieldE4; -protected: - virtual bool handleMessage(CEnterRoomMsg &msg); public: CLASSDEF CGondolierMixer(); |