diff options
72 files changed, 84 insertions, 84 deletions
diff --git a/engines/titanic/game/arboretum_gate.cpp b/engines/titanic/game/arboretum_gate.cpp index f4193b0f2f..a892e65fc8 100644 --- a/engines/titanic/game/arboretum_gate.cpp +++ b/engines/titanic/game/arboretum_gate.cpp @@ -133,17 +133,17 @@ void CArboretumGate::load(SimpleFile *file) { CBackground::load(file); } -bool CArboretumGate::handleEvent(const CActMsg &msg) { return false; } -bool CArboretumGate::handleEvent(const CLeaveViewMsg &msg) { return false; } -bool CArboretumGate::handleEvent(const CTurnOff &msg) { return false; } -bool CArboretumGate::handleEvent(const CMouseButtonDownMsg &msg) { return false; } +bool CArboretumGate::handleEvent(CActMsg &msg) { return false; } +bool CArboretumGate::handleEvent(CLeaveViewMsg &msg) { return false; } +bool CArboretumGate::handleEvent(CTurnOff &msg) { return false; } +bool CArboretumGate::handleEvent(CMouseButtonDownMsg &msg) { return false; } -bool CArboretumGate::handleEvent(const CEnterViewMsg &msg) { +bool CArboretumGate::handleEvent(CEnterViewMsg &msg) { warning("CArboretumGate::handleEvent"); return false; } -bool CArboretumGate::handleEvent(const CTurnOn &msg) { return false; } -bool CArboretumGate::handleEvent(const CMovieEndMsg &msg) { return false; } +bool CArboretumGate::handleEvent(CTurnOn &msg) { return false; } +bool CArboretumGate::handleEvent(CMovieEndMsg &msg) { return false; } } // End of namespace Titanic diff --git a/engines/titanic/game/arboretum_gate.h b/engines/titanic/game/arboretum_gate.h index 514192e151..7432799460 100644 --- a/engines/titanic/game/arboretum_gate.h +++ b/engines/titanic/game/arboretum_gate.h @@ -69,13 +69,13 @@ private: int _field150; CString _string2; protected: - virtual bool handleEvent(const CActMsg &msg); - virtual bool handleEvent(const CLeaveViewMsg &msg); - virtual bool handleEvent(const CTurnOff &msg); - virtual bool handleEvent(const CMouseButtonDownMsg &msg); - virtual bool handleEvent(const CEnterViewMsg &msg); - virtual bool handleEvent(const CTurnOn &msg); - virtual bool handleEvent(const CMovieEndMsg &msg); + virtual bool handleEvent(CActMsg &msg); + virtual bool handleEvent(CLeaveViewMsg &msg); + virtual bool handleEvent(CTurnOff &msg); + virtual bool handleEvent(CMouseButtonDownMsg &msg); + virtual bool handleEvent(CEnterViewMsg &msg); + virtual bool handleEvent(CTurnOn &msg); + virtual bool handleEvent(CMovieEndMsg &msg); public: CLASSDEF CArboretumGate(); diff --git a/engines/titanic/game/auto_animate.cpp b/engines/titanic/game/auto_animate.cpp index c79fa74167..958200f4cc 100644 --- a/engines/titanic/game/auto_animate.cpp +++ b/engines/titanic/game/auto_animate.cpp @@ -40,7 +40,7 @@ void CAutoAnimate::load(SimpleFile *file) { CBackground::load(file); } -bool CAutoAnimate::handleEvent(const CEnterViewMsg &msg) { +bool CAutoAnimate::handleEvent(CEnterViewMsg &msg) { warning("CAutoAnimate::handleEvent"); return true; } diff --git a/engines/titanic/game/auto_animate.h b/engines/titanic/game/auto_animate.h index 160fe09d90..56e40a470c 100644 --- a/engines/titanic/game/auto_animate.h +++ b/engines/titanic/game/auto_animate.h @@ -34,7 +34,7 @@ private: int _fieldE4; int _fieldE8; protected: - virtual bool handleEvent(const CEnterViewMsg &msg); + virtual bool handleEvent(CEnterViewMsg &msg); public: CLASSDEF CAutoAnimate() : CBackground(), _fieldE0(1), _fieldE4(1), _fieldE8(0) {} diff --git a/engines/titanic/game/bar_bell.cpp b/engines/titanic/game/bar_bell.cpp index 1639b7da39..1ac7568b0f 100644 --- a/engines/titanic/game/bar_bell.cpp +++ b/engines/titanic/game/bar_bell.cpp @@ -50,7 +50,7 @@ void CBarBell::load(SimpleFile *file) { CGameObject::load(file); } -bool CBarBell::handleEvent(const CEnterRoomMsg &msg) { +bool CBarBell::handleEvent(CEnterRoomMsg &msg) { _fieldBC = 0; return true; } diff --git a/engines/titanic/game/bar_bell.h b/engines/titanic/game/bar_bell.h index 432bf3a281..111b0ac267 100644 --- a/engines/titanic/game/bar_bell.h +++ b/engines/titanic/game/bar_bell.h @@ -36,7 +36,7 @@ public: int _fieldC8; int _fieldCC; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CBarBell(); diff --git a/engines/titanic/game/bomb.cpp b/engines/titanic/game/bomb.cpp index e4cf1b3830..a8bf15ec33 100644 --- a/engines/titanic/game/bomb.cpp +++ b/engines/titanic/game/bomb.cpp @@ -70,7 +70,7 @@ void CBomb::load(SimpleFile *file) { CBackground::load(file); } -bool CBomb::handleEvent(const CEnterRoomMsg &msg) { +bool CBomb::handleEvent(CEnterRoomMsg &msg) { _fieldE8 = 12; _fieldEC = 9; _fieldF0 = 0; diff --git a/engines/titanic/game/bomb.h b/engines/titanic/game/bomb.h index 4c7c9526ea..9cbdf84081 100644 --- a/engines/titanic/game/bomb.h +++ b/engines/titanic/game/bomb.h @@ -41,7 +41,7 @@ private: int _startingTicks; int _field104; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CBomb(); diff --git a/engines/titanic/game/chicken_cooler.cpp b/engines/titanic/game/chicken_cooler.cpp index 54acc405fd..4ece0d6d05 100644 --- a/engines/titanic/game/chicken_cooler.cpp +++ b/engines/titanic/game/chicken_cooler.cpp @@ -40,7 +40,7 @@ void CChickenCooler::load(SimpleFile *file) { CGameObject::load(file); } -bool CChickenCooler::handleEvent(const CEnterRoomMsg &msg) { +bool CChickenCooler::handleEvent(CEnterRoomMsg &msg) { warning("CChickenCoolor::handlEvent"); return true; } diff --git a/engines/titanic/game/chicken_cooler.h b/engines/titanic/game/chicken_cooler.h index 6f75649957..210183a474 100644 --- a/engines/titanic/game/chicken_cooler.h +++ b/engines/titanic/game/chicken_cooler.h @@ -33,7 +33,7 @@ private: int _fieldBC; int _fieldC0; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CChickenCooler() : CGameObject(), _fieldBC(0), _fieldC0(0) {} diff --git a/engines/titanic/game/doorbot_elevator_handler.cpp b/engines/titanic/game/doorbot_elevator_handler.cpp index b8cec40e1a..718a464bf3 100644 --- a/engines/titanic/game/doorbot_elevator_handler.cpp +++ b/engines/titanic/game/doorbot_elevator_handler.cpp @@ -40,7 +40,7 @@ void CDoorbotElevatorHandler::load(SimpleFile *file) { CGameObject::load(file); } -bool CDoorbotElevatorHandler::handleEvent(const CEnterNodeMsg &msg) { +bool CDoorbotElevatorHandler::handleEvent(CEnterNodeMsg &msg) { warning("CDoorbotElevatorHandler::handleEvent"); return true; } diff --git a/engines/titanic/game/doorbot_elevator_handler.h b/engines/titanic/game/doorbot_elevator_handler.h index 4c34248a71..04f3a75b18 100644 --- a/engines/titanic/game/doorbot_elevator_handler.h +++ b/engines/titanic/game/doorbot_elevator_handler.h @@ -33,7 +33,7 @@ private: static int _v1; int _value; protected: - virtual bool handleEvent(const CEnterNodeMsg &msg); + virtual bool handleEvent(CEnterNodeMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/end_sequence_control.cpp b/engines/titanic/game/end_sequence_control.cpp index f930d61787..c3f5a2a007 100644 --- a/engines/titanic/game/end_sequence_control.cpp +++ b/engines/titanic/game/end_sequence_control.cpp @@ -34,7 +34,7 @@ void CEndSequenceControl::load(SimpleFile *file) { CGameObject::load(file); } -bool CEndSequenceControl::handleEvent(const CEnterRoomMsg &msg) { +bool CEndSequenceControl::handleEvent(CEnterRoomMsg &msg) { warning("TODO: CEndSequenceControl::handleEvent"); return true; } diff --git a/engines/titanic/game/end_sequence_control.h b/engines/titanic/game/end_sequence_control.h index fb1fa3a13c..d0ddd9c920 100644 --- a/engines/titanic/game/end_sequence_control.h +++ b/engines/titanic/game/end_sequence_control.h @@ -30,7 +30,7 @@ namespace Titanic { class CEndSequenceControl : public CGameObject, CEnterRoomMsgTarget { protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/fan_noises.cpp b/engines/titanic/game/fan_noises.cpp index 6627332465..7ec55c46f9 100644 --- a/engines/titanic/game/fan_noises.cpp +++ b/engines/titanic/game/fan_noises.cpp @@ -55,7 +55,7 @@ void CFanNoises::load(SimpleFile *file) { CGameObject::load(file); } -bool CFanNoises::handleEvent(const CEnterRoomMsg &msg) { +bool CFanNoises::handleEvent(CEnterRoomMsg &msg) { warning("CFanNoises::handleEvent"); return true; } diff --git a/engines/titanic/game/fan_noises.h b/engines/titanic/game/fan_noises.h index 2cd96a33cb..835d853d09 100644 --- a/engines/titanic/game/fan_noises.h +++ b/engines/titanic/game/fan_noises.h @@ -38,7 +38,7 @@ private: int _fieldD0; int _fieldD4; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CFanNoises(); diff --git a/engines/titanic/game/get_lift_eye2.cpp b/engines/titanic/game/get_lift_eye2.cpp index bc51f7cabc..7894c5ef58 100644 --- a/engines/titanic/game/get_lift_eye2.cpp +++ b/engines/titanic/game/get_lift_eye2.cpp @@ -46,7 +46,7 @@ void CGetLiftEye2::load(SimpleFile *file) { CGameObject::load(file); } -bool CGetLiftEye2::handleEvent(const CEnterRoomMsg &msg) { +bool CGetLiftEye2::handleEvent(CEnterRoomMsg &msg) { warning("CGetLiftEye2::handleEvent"); return true; } diff --git a/engines/titanic/game/get_lift_eye2.h b/engines/titanic/game/get_lift_eye2.h index d9465b48bc..5803ad03bd 100644 --- a/engines/titanic/game/get_lift_eye2.h +++ b/engines/titanic/game/get_lift_eye2.h @@ -31,7 +31,7 @@ class CGetLiftEye2 : public CGameObject, CEnterRoomMsgTarget { private: static CString *_v1; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF static void init(); diff --git a/engines/titanic/game/gondolier/gondolier_mixer.cpp b/engines/titanic/game/gondolier/gondolier_mixer.cpp index 391c513ccc..f4fb655cf2 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.cpp +++ b/engines/titanic/game/gondolier/gondolier_mixer.cpp @@ -56,7 +56,7 @@ void CGondolierMixer::load(SimpleFile *file) { CGondolierBase::load(file); } -bool CGondolierMixer::handleEvent(const CEnterRoomMsg &msg) { +bool CGondolierMixer::handleEvent(CEnterRoomMsg &msg) { CTreeItem *parent = getParent(); if (parent == msg._room) msg.execute(parent); diff --git a/engines/titanic/game/gondolier/gondolier_mixer.h b/engines/titanic/game/gondolier/gondolier_mixer.h index ce8959b77a..1288290d6f 100644 --- a/engines/titanic/game/gondolier/gondolier_mixer.h +++ b/engines/titanic/game/gondolier/gondolier_mixer.h @@ -38,7 +38,7 @@ private: CString _string2; int _fieldE4; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CGondolierMixer(); diff --git a/engines/titanic/game/light.cpp b/engines/titanic/game/light.cpp index 7a24391b0e..856e6a463f 100644 --- a/engines/titanic/game/light.cpp +++ b/engines/titanic/game/light.cpp @@ -57,7 +57,7 @@ void CLight::load(SimpleFile *file) { CBackground::load(file); } -bool CLight::handleEvent(const CEnterRoomMsg &msg) { +bool CLight::handleEvent(CEnterRoomMsg &msg) { warning("CLight::handleEvent"); return true; } diff --git a/engines/titanic/game/light.h b/engines/titanic/game/light.h index 650e6ba87e..42e7224a72 100644 --- a/engines/titanic/game/light.h +++ b/engines/titanic/game/light.h @@ -39,7 +39,7 @@ private: int _fieldF8; int _fieldFC; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CLight(); diff --git a/engines/titanic/game/light_switch.cpp b/engines/titanic/game/light_switch.cpp index 5e1b94ac18..b857bfb159 100644 --- a/engines/titanic/game/light_switch.cpp +++ b/engines/titanic/game/light_switch.cpp @@ -50,7 +50,7 @@ void CLightSwitch::load(SimpleFile *file) { CBackground::load(file); } -bool CLightSwitch::handleEvent(const CEnterRoomMsg &msg) { +bool CLightSwitch::handleEvent(CEnterRoomMsg &msg) { warning("CLightSwitch::handleEvent"); return true; } diff --git a/engines/titanic/game/light_switch.h b/engines/titanic/game/light_switch.h index fd2c392d13..1cda539dd0 100644 --- a/engines/titanic/game/light_switch.h +++ b/engines/titanic/game/light_switch.h @@ -36,7 +36,7 @@ private: int _fieldE4; int _fieldE8; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CLightSwitch(); diff --git a/engines/titanic/game/long_stick_dispenser.cpp b/engines/titanic/game/long_stick_dispenser.cpp index 237c1f6112..5d7df1df12 100644 --- a/engines/titanic/game/long_stick_dispenser.cpp +++ b/engines/titanic/game/long_stick_dispenser.cpp @@ -42,7 +42,7 @@ void CLongStickDispenser::load(SimpleFile *file) { CGameObject::load(file); } -bool CLongStickDispenser::handleEvent(const CEnterRoomMsg &msg) { +bool CLongStickDispenser::handleEvent(CEnterRoomMsg &msg) { _fieldC0 = 0; _fieldC4 = 1; return true; diff --git a/engines/titanic/game/long_stick_dispenser.h b/engines/titanic/game/long_stick_dispenser.h index 75ada29a96..14785a785b 100644 --- a/engines/titanic/game/long_stick_dispenser.h +++ b/engines/titanic/game/long_stick_dispenser.h @@ -34,7 +34,7 @@ private: int _fieldC0; int _fieldC4; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CLongStickDispenser() : CGameObject(), _fieldBC(0), diff --git a/engines/titanic/game/parrot/player_meets_parrot.cpp b/engines/titanic/game/parrot/player_meets_parrot.cpp index 70628b345a..adb2dc5d36 100644 --- a/engines/titanic/game/parrot/player_meets_parrot.cpp +++ b/engines/titanic/game/parrot/player_meets_parrot.cpp @@ -34,7 +34,7 @@ void CPlayerMeetsParrot::load(SimpleFile *file) { CGameObject::load(file); } -bool CPlayerMeetsParrot::handleEvent(const CEnterRoomMsg &msg) { +bool CPlayerMeetsParrot::handleEvent(CEnterRoomMsg &msg) { warning("CPlayerMeetsParrot::handleEvent"); return true; } diff --git a/engines/titanic/game/parrot/player_meets_parrot.h b/engines/titanic/game/parrot/player_meets_parrot.h index 8572fd701d..9b8138f124 100644 --- a/engines/titanic/game/parrot/player_meets_parrot.h +++ b/engines/titanic/game/parrot/player_meets_parrot.h @@ -30,7 +30,7 @@ namespace Titanic { class CPlayerMeetsParrot : public CGameObject, CEnterRoomMsgTarget { protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/pet/pet_monitor.cpp b/engines/titanic/game/pet/pet_monitor.cpp index 649ac978e9..44d24f264e 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(const CEnterRoomMsg &msg) { +bool CPETMonitor::handleEvent(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 97961ee929..1d66a58d29 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(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/pet/pet_position.cpp b/engines/titanic/game/pet/pet_position.cpp index aafc21beb2..b25111f62c 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(const CEnterRoomMsg &msg) { +bool CPETPosition::handleEvent(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 d72f42ca3a..8a0623932b 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(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/pet/pet_transport.cpp b/engines/titanic/game/pet/pet_transport.cpp index 40cc155c5b..a88b703b10 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(const CEnterRoomMsg &msg) { +bool CPETTransport::handleEvent(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 1eb48322e2..3dc856d5b2 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(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/phonograph.cpp b/engines/titanic/game/phonograph.cpp index 2ff8ca99bb..f7a696e549 100644 --- a/engines/titanic/game/phonograph.cpp +++ b/engines/titanic/game/phonograph.cpp @@ -55,7 +55,7 @@ void CPhonograph::load(SimpleFile *file) { CMusicPlayer::load(file); } -bool CPhonograph::handleEvent(const CEnterRoomMsg &msg) { +bool CPhonograph::handleEvent(CEnterRoomMsg &msg) { warning("CPhonograph::handleEvent"); return true; } diff --git a/engines/titanic/game/phonograph.h b/engines/titanic/game/phonograph.h index 157bd44052..6efe10bab2 100644 --- a/engines/titanic/game/phonograph.h +++ b/engines/titanic/game/phonograph.h @@ -38,7 +38,7 @@ protected: int _fieldF0; int _fieldF4; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CPhonograph(); diff --git a/engines/titanic/game/sgt/sgt_state_room.cpp b/engines/titanic/game/sgt/sgt_state_room.cpp index a6dc523bcf..cf735dd6d0 100644 --- a/engines/titanic/game/sgt/sgt_state_room.cpp +++ b/engines/titanic/game/sgt/sgt_state_room.cpp @@ -90,7 +90,7 @@ void CSGTStateRoom::load(SimpleFile *file) { CBackground::load(file); } -bool CSGTStateRoom::handleEvent(const CEnterRoomMsg &msg) { +bool CSGTStateRoom::handleEvent(CEnterRoomMsg &msg) { warning("CSGTStateRoom::handleEvent"); return true; } diff --git a/engines/titanic/game/sgt/sgt_state_room.h b/engines/titanic/game/sgt/sgt_state_room.h index dbe4538ced..4ec1617875 100644 --- a/engines/titanic/game/sgt/sgt_state_room.h +++ b/engines/titanic/game/sgt/sgt_state_room.h @@ -55,7 +55,7 @@ private: int _fieldEC; int _fieldF0; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CSGTStateRoom(); diff --git a/engines/titanic/game/ship_setting.cpp b/engines/titanic/game/ship_setting.cpp index 7a3951df71..6d12e59c81 100644 --- a/engines/titanic/game/ship_setting.cpp +++ b/engines/titanic/game/ship_setting.cpp @@ -48,7 +48,7 @@ void CShipSetting::load(SimpleFile *file) { CBackground::load(file); } -bool CShipSetting::handleEvent(const CEnterRoomMsg &msg) { +bool CShipSetting::handleEvent(CEnterRoomMsg &msg) { warning("CShipSetting::handleEvent"); return true; } diff --git a/engines/titanic/game/ship_setting.h b/engines/titanic/game/ship_setting.h index 30780fd3d7..cbf4e9f61a 100644 --- a/engines/titanic/game/ship_setting.h +++ b/engines/titanic/game/ship_setting.h @@ -35,7 +35,7 @@ private: CString _string4; CString _string5; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CShipSetting(); diff --git a/engines/titanic/game/transport/lift.cpp b/engines/titanic/game/transport/lift.cpp index 22201291aa..edf69fe31a 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(const CEnterRoomMsg &msg) { +bool CLift::handleEvent(CEnterRoomMsg &msg) { warning("CLift::handleEvent"); return true; } diff --git a/engines/titanic/game/transport/lift.h b/engines/titanic/game/transport/lift.h index 42a340c61f..439e65bb30 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(const CEnterRoomMsg &msg); + virtual bool handleEvent(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 b707fbbed9..161f032480 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(const CEnterRoomMsg &msg) { return true; } + virtual bool handleEvent(CEnterRoomMsg &msg) { return true; } public: CLASSDEF CLiftindicator(); diff --git a/engines/titanic/game/transport/pellerator.cpp b/engines/titanic/game/transport/pellerator.cpp index 99c4db3160..16f42772c3 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(const CEnterRoomMsg &msg) { +bool CPellerator::handleEvent(CEnterRoomMsg &msg) { warning("CPellerator::handleEvent"); return true; } diff --git a/engines/titanic/game/transport/pellerator.h b/engines/titanic/game/transport/pellerator.h index 502af2430a..c997373382 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(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/game/up_lighter.cpp b/engines/titanic/game/up_lighter.cpp index beb159f967..817b179e3e 100644 --- a/engines/titanic/game/up_lighter.cpp +++ b/engines/titanic/game/up_lighter.cpp @@ -48,7 +48,7 @@ void CUpLighter::load(SimpleFile *file) { CDropTarget::load(file); } -bool CUpLighter::handleEvent(const CEnterRoomMsg &msg) { +bool CUpLighter::handleEvent(CEnterRoomMsg &msg) { warning("CUpLighter::handleEvent"); return true; } diff --git a/engines/titanic/game/up_lighter.h b/engines/titanic/game/up_lighter.h index 15fa14c16a..6c722ddc2a 100644 --- a/engines/titanic/game/up_lighter.h +++ b/engines/titanic/game/up_lighter.h @@ -35,7 +35,7 @@ private: int _field120; int _field124; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CUpLighter(); diff --git a/engines/titanic/game/volume_control.cpp b/engines/titanic/game/volume_control.cpp index 26f89a7b55..801dfd1b60 100644 --- a/engines/titanic/game/volume_control.cpp +++ b/engines/titanic/game/volume_control.cpp @@ -45,7 +45,7 @@ void CVolumeControl::load(SimpleFile *file) { CGameObject::load(file); } -bool CVolumeControl::handleEvent(const CEnterNodeMsg &msg) { +bool CVolumeControl::handleEvent(CEnterNodeMsg &msg) { warning("CVolumeControl::handleEvent"); return true; } diff --git a/engines/titanic/game/volume_control.h b/engines/titanic/game/volume_control.h index 8fa7d01a77..f3f6a75278 100644 --- a/engines/titanic/game/volume_control.h +++ b/engines/titanic/game/volume_control.h @@ -34,7 +34,7 @@ private: CString _string1; int _fieldCC; protected: - virtual bool handleEvent(const CEnterNodeMsg &msg); + virtual bool handleEvent(CEnterNodeMsg &msg); public: CLASSDEF CVolumeControl(); diff --git a/engines/titanic/messages/bilge_dispensor_event.cpp b/engines/titanic/messages/bilge_dispensor_event.cpp index c4c8375f5d..c20fe10992 100644 --- a/engines/titanic/messages/bilge_dispensor_event.cpp +++ b/engines/titanic/messages/bilge_dispensor_event.cpp @@ -34,7 +34,7 @@ void CBilgeDispensorEvent::load(SimpleFile *file) { CAutoSoundEvent::load(file); } -bool CBilgeDispensorEvent::handleEvent(const CEnterRoomMsg &msg) { +bool CBilgeDispensorEvent::handleEvent(CEnterRoomMsg &msg) { _value1 = 0; return true; } diff --git a/engines/titanic/messages/bilge_dispensor_event.h b/engines/titanic/messages/bilge_dispensor_event.h index 4334465c02..9f91b61ef9 100644 --- a/engines/titanic/messages/bilge_dispensor_event.h +++ b/engines/titanic/messages/bilge_dispensor_event.h @@ -30,7 +30,7 @@ namespace Titanic { class CBilgeDispensorEvent : public CAutoSoundEvent { protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/messages/messages.h b/engines/titanic/messages/messages.h index d22144332b..d89b0e1ae5 100644 --- a/engines/titanic/messages/messages.h +++ b/engines/titanic/messages/messages.h @@ -38,7 +38,7 @@ enum MessageFlag { }; #define MSGTARGET(NAME) class NAME; class NAME##Target { public: \ - virtual bool handleEvent(const NAME &msg) = 0; } + virtual bool handleEvent(NAME &msg) = 0; } class CMessage : public CSaveableObject { public: diff --git a/engines/titanic/moves/enter_bridge.cpp b/engines/titanic/moves/enter_bridge.cpp index 6f8ba4cd41..359cfcb48f 100644 --- a/engines/titanic/moves/enter_bridge.cpp +++ b/engines/titanic/moves/enter_bridge.cpp @@ -36,7 +36,7 @@ void CEnterBridge::load(SimpleFile *file) { CGameObject::load(file); } -bool CEnterBridge::handleEvent(const CEnterRoomMsg &msg) { +bool CEnterBridge::handleEvent(CEnterRoomMsg &msg) { warning("CEnterBridge::handlEvent"); return true; } diff --git a/engines/titanic/moves/enter_bridge.h b/engines/titanic/moves/enter_bridge.h index 3685bed8a1..39343ef904 100644 --- a/engines/titanic/moves/enter_bridge.h +++ b/engines/titanic/moves/enter_bridge.h @@ -32,7 +32,7 @@ class CEnterBridge : public CGameObject, CEnterRoomMsgTarget { private: int _value; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CEnterBridge() : CGameObject(), _value(1) {} diff --git a/engines/titanic/npcs/barbot.cpp b/engines/titanic/npcs/barbot.cpp index c9a96b989b..907d3c0c71 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(const CEnterRoomMsg &msg) { +bool CBarbot::handleEvent(CEnterRoomMsg &msg) { warning("TODO: Barbot::CEnterRoomMsg"); return true; } diff --git a/engines/titanic/npcs/barbot.h b/engines/titanic/npcs/barbot.h index 160edd63d9..442578ef6c 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(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CBarbot(); diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp index 76a48f07d1..dfc0a4f0ad 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(const CEnterRoomMsg &msg) { +bool CLiftBot::handleEvent(CEnterRoomMsg &msg) { warning("CLiftBot::handleEvent"); return true; } diff --git a/engines/titanic/npcs/liftbot.h b/engines/titanic/npcs/liftbot.h index 81c5399e7f..3a41bf3a96 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(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CLiftBot(); diff --git a/engines/titanic/sound/auto_music_player.cpp b/engines/titanic/sound/auto_music_player.cpp index 97c59d075d..638cac8c26 100644 --- a/engines/titanic/sound/auto_music_player.cpp +++ b/engines/titanic/sound/auto_music_player.cpp @@ -41,7 +41,7 @@ void CAutoMusicPlayer::load(SimpleFile *file) { CAutoMusicPlayerBase::load(file); } -bool CAutoMusicPlayer::handleEvent(const CEnterRoomMsg &msg) { +bool CAutoMusicPlayer::handleEvent(CEnterRoomMsg &msg) { if (!_fieldCC) { warning("TODO"); } diff --git a/engines/titanic/sound/auto_music_player.h b/engines/titanic/sound/auto_music_player.h index 6fdf3766c6..d2f42ac5c5 100644 --- a/engines/titanic/sound/auto_music_player.h +++ b/engines/titanic/sound/auto_music_player.h @@ -32,7 +32,7 @@ class CAutoMusicPlayer : public CAutoMusicPlayerBase, CEnterRoomMsgTarget { private: CString _string2; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CAutoMusicPlayer(); diff --git a/engines/titanic/sound/music_player.cpp b/engines/titanic/sound/music_player.cpp index e2299e6297..25f73b0dc5 100644 --- a/engines/titanic/sound/music_player.cpp +++ b/engines/titanic/sound/music_player.cpp @@ -44,7 +44,7 @@ void CMusicPlayer::load(SimpleFile *file) { CGameObject::load(file); } -bool CMusicPlayer::handleEvent(const CEnterRoomMsg &msg) { +bool CMusicPlayer::handleEvent(CEnterRoomMsg &msg) { warning("TODO: CMusicPlayer::handleEvent"); return true; } diff --git a/engines/titanic/sound/music_player.h b/engines/titanic/sound/music_player.h index 1796a25d4b..96a6968c6d 100644 --- a/engines/titanic/sound/music_player.h +++ b/engines/titanic/sound/music_player.h @@ -35,7 +35,7 @@ protected: int _fieldCC; int _fieldD0; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CMusicPlayer() : CGameObject(), diff --git a/engines/titanic/sound/node_auto_sound_player.cpp b/engines/titanic/sound/node_auto_sound_player.cpp index 5709cf5e81..0ef6c8d2ac 100644 --- a/engines/titanic/sound/node_auto_sound_player.cpp +++ b/engines/titanic/sound/node_auto_sound_player.cpp @@ -36,7 +36,7 @@ void CNodeAutoSoundPlayer::load(SimpleFile *file) { CAutoSoundPlayer::load(file); } -bool CNodeAutoSoundPlayer::handleEvent(const CEnterNodeMsg &msg) { +bool CNodeAutoSoundPlayer::handleEvent(CEnterNodeMsg &msg) { warning("CNodeAutoSoundPlayer::handleEvent"); return true; } diff --git a/engines/titanic/sound/node_auto_sound_player.h b/engines/titanic/sound/node_auto_sound_player.h index c635d7e3e9..258aa47eea 100644 --- a/engines/titanic/sound/node_auto_sound_player.h +++ b/engines/titanic/sound/node_auto_sound_player.h @@ -32,7 +32,7 @@ class CNodeAutoSoundPlayer : public CAutoSoundPlayer, CEnterNodeMsgTarget { private: int _fieldEC; protected: - virtual bool handleEvent(const CEnterNodeMsg &msg); + virtual bool handleEvent(CEnterNodeMsg &msg); public: CLASSDEF CNodeAutoSoundPlayer() : CAutoSoundPlayer(), _fieldEC(1) {} diff --git a/engines/titanic/sound/restricted_auto_music_player.cpp b/engines/titanic/sound/restricted_auto_music_player.cpp index a57769bf25..2ee8f2d082 100644 --- a/engines/titanic/sound/restricted_auto_music_player.cpp +++ b/engines/titanic/sound/restricted_auto_music_player.cpp @@ -44,7 +44,7 @@ void CRestrictedAutoMusicPlayer::load(SimpleFile *file) { CAutoMusicPlayer::load(file); } -bool CRestrictedAutoMusicPlayer::handleEvent(const CEnterRoomMsg &msg) { +bool CRestrictedAutoMusicPlayer::handleEvent(CEnterRoomMsg &msg) { warning("CRestrictedAutoMusicPlayer::handleEvent"); return true; } diff --git a/engines/titanic/sound/restricted_auto_music_player.h b/engines/titanic/sound/restricted_auto_music_player.h index a9f17d8729..efb3dc2892 100644 --- a/engines/titanic/sound/restricted_auto_music_player.h +++ b/engines/titanic/sound/restricted_auto_music_player.h @@ -35,7 +35,7 @@ private: CString _string5; CString _string6; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/sound/room_auto_sound_player.cpp b/engines/titanic/sound/room_auto_sound_player.cpp index b8557aaa81..549f27be63 100644 --- a/engines/titanic/sound/room_auto_sound_player.cpp +++ b/engines/titanic/sound/room_auto_sound_player.cpp @@ -34,7 +34,7 @@ void CRoomAutoSoundPlayer::load(SimpleFile *file) { CAutoSoundPlayer::load(file); } -bool CRoomAutoSoundPlayer::handleEvent(const CEnterRoomMsg &msg) { +bool CRoomAutoSoundPlayer::handleEvent(CEnterRoomMsg &msg) { warning("CRoomAutoSoundPlayer::handleEvent"); return true; } diff --git a/engines/titanic/sound/room_auto_sound_player.h b/engines/titanic/sound/room_auto_sound_player.h index bda9727a0f..a3ec35cb04 100644 --- a/engines/titanic/sound/room_auto_sound_player.h +++ b/engines/titanic/sound/room_auto_sound_player.h @@ -30,7 +30,7 @@ namespace Titanic { class CRoomAutoSoundPlayer : public CAutoSoundPlayer, CEnterRoomMsgTarget { protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/sound/room_trigger_auto_music_player.cpp b/engines/titanic/sound/room_trigger_auto_music_player.cpp index 9e4da684d9..3c0ac0536b 100644 --- a/engines/titanic/sound/room_trigger_auto_music_player.cpp +++ b/engines/titanic/sound/room_trigger_auto_music_player.cpp @@ -34,7 +34,7 @@ void CRoomTriggerAutoMusicPlayer::load(SimpleFile *file) { CTriggerAutoMusicPlayer::load(file); } -bool CRoomTriggerAutoMusicPlayer::handleEvent(const CEnterRoomMsg &msg) { +bool CRoomTriggerAutoMusicPlayer::handleEvent(CEnterRoomMsg &msg) { warning("CRoomTriggerAutoMusicPlayer::handleEvent"); return true; } diff --git a/engines/titanic/sound/room_trigger_auto_music_player.h b/engines/titanic/sound/room_trigger_auto_music_player.h index 1915f92de1..9a478a0a08 100644 --- a/engines/titanic/sound/room_trigger_auto_music_player.h +++ b/engines/titanic/sound/room_trigger_auto_music_player.h @@ -30,7 +30,7 @@ namespace Titanic { class CRoomTriggerAutoMusicPlayer : public CTriggerAutoMusicPlayer, CEnterRoomMsgTarget { protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF diff --git a/engines/titanic/sound/titania_speech.cpp b/engines/titanic/sound/titania_speech.cpp index 87ab18a2cb..16a88e40ec 100644 --- a/engines/titanic/sound/titania_speech.cpp +++ b/engines/titanic/sound/titania_speech.cpp @@ -40,7 +40,7 @@ void CTitaniaSpeech::load(SimpleFile *file) { CGameObject::load(file); } -bool CTitaniaSpeech::handleEvent(const CEnterRoomMsg &msg) { +bool CTitaniaSpeech::handleEvent(CEnterRoomMsg &msg) { warning("CTitaniaSpeech::handleEvent"); return true; } diff --git a/engines/titanic/sound/titania_speech.h b/engines/titanic/sound/titania_speech.h index a981029c7d..09a8495fef 100644 --- a/engines/titanic/sound/titania_speech.h +++ b/engines/titanic/sound/titania_speech.h @@ -32,7 +32,7 @@ class CTitaniaSpeech : public CGameObject { private: int _value1, _value2; protected: - virtual bool handleEvent(const CEnterRoomMsg &msg); + virtual bool handleEvent(CEnterRoomMsg &msg); public: CLASSDEF CTitaniaSpeech() : CGameObject(), _value1(1), _value2(0) {} |