aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game/transport
diff options
context:
space:
mode:
authorPaul Gilbert2016-03-24 07:49:59 -0400
committerPaul Gilbert2016-03-24 07:49:59 -0400
commit66e198d665a8aacd1724848a40e6533f3d5cfebc (patch)
tree549c1414ea83683eb9c75ba5eea7d3d07733009a /engines/titanic/game/transport
parent2f532c086d5cd466a54763fc4fee14d0940e0abb (diff)
downloadscummvm-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/transport')
-rw-r--r--engines/titanic/game/transport/lift.cpp2
-rw-r--r--engines/titanic/game/transport/lift.h2
-rw-r--r--engines/titanic/game/transport/lift_indicator.h2
-rw-r--r--engines/titanic/game/transport/pellerator.cpp2
-rw-r--r--engines/titanic/game/transport/pellerator.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp
index edf69fe31a..a795a15a16 100644
--- a/engines/titanic/game/transport/lift.cpp
+++ b/engines/titanic/game/transport/lift.cpp
@@ -57,7 +57,7 @@ void CLift::load(SimpleFile *file) {
CTransport::load(file);
}
-bool CLift::handleEvent(CEnterRoomMsg &msg) {
+bool CLift::handleMessage(CEnterRoomMsg &msg) {
warning("CLift::handleEvent");
return true;
}
diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h
index 439e65bb30..4f628231e8 100644
--- a/engines/titanic/game/transport/lift.h
+++ b/engines/titanic/game/transport/lift.h
@@ -39,7 +39,7 @@ private:
int _fieldF8;
protected:
- virtual bool handleEvent(CEnterRoomMsg &msg);
+ virtual bool handleMessage(CEnterRoomMsg &msg);
public:
CLASSDEF
CLift() : CTransport(), _fieldF8(1) {}
diff --git a/engines/titanic/game/transport/lift_indicator.h b/engines/titanic/game/transport/lift_indicator.h
index 80f8b0d05b..7cc5585d3b 100644
--- a/engines/titanic/game/transport/lift_indicator.h
+++ b/engines/titanic/game/transport/lift_indicator.h
@@ -35,7 +35,7 @@ private:
int _field108;
int _field10C;
protected:
- virtual bool handleEvent(CEnterRoomMsg &msg) { return true; }
+ virtual bool handleMessage(CEnterRoomMsg &msg) { return true; }
public:
CLASSDEF
CLiftindicator();
diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp
index 16f42772c3..eca1037128 100644
--- a/engines/titanic/game/transport/pellerator.cpp
+++ b/engines/titanic/game/transport/pellerator.cpp
@@ -43,7 +43,7 @@ void CPellerator::load(SimpleFile *file) {
CTransport::load(file);
}
-bool CPellerator::handleEvent(CEnterRoomMsg &msg) {
+bool CPellerator::handleMessage(CEnterRoomMsg &msg) {
warning("CPellerator::handleEvent");
return true;
}
diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h
index c997373382..03e45751b2 100644
--- a/engines/titanic/game/transport/pellerator.h
+++ b/engines/titanic/game/transport/pellerator.h
@@ -33,7 +33,7 @@ private:
static int _v1;
static int _v2;
protected:
- virtual bool handleEvent(CEnterRoomMsg &msg);
+ virtual bool handleMessage(CEnterRoomMsg &msg);
public:
CLASSDEF