aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/sound
diff options
context:
space:
mode:
authorPaul Gilbert2016-03-18 23:18:59 -0400
committerPaul Gilbert2016-03-18 23:18:59 -0400
commit4f5202f958d55ccfda6e67a6b8933630de240e87 (patch)
tree4054258dcea5b428a49534a9453e66dc07864ad0 /engines/titanic/sound
parent7a38b51357ba581fe51a392a031d09dd238039e8 (diff)
downloadscummvm-rg350-4f5202f958d55ccfda6e67a6b8933630de240e87.tar.gz
scummvm-rg350-4f5202f958d55ccfda6e67a6b8933630de240e87.tar.bz2
scummvm-rg350-4f5202f958d55ccfda6e67a6b8933630de240e87.zip
TITANIC: Remove const prefix from passed messages
Turns out that some of the messages have properties that the objects that handle them can set. For example, the CMouseDragStartMsg has a _dragItem property that an item that allows dragging will explicitly set, allowing the input handler to keep track of what was dragged.
Diffstat (limited to 'engines/titanic/sound')
-rw-r--r--engines/titanic/sound/auto_music_player.cpp2
-rw-r--r--engines/titanic/sound/auto_music_player.h2
-rw-r--r--engines/titanic/sound/music_player.cpp2
-rw-r--r--engines/titanic/sound/music_player.h2
-rw-r--r--engines/titanic/sound/node_auto_sound_player.cpp2
-rw-r--r--engines/titanic/sound/node_auto_sound_player.h2
-rw-r--r--engines/titanic/sound/restricted_auto_music_player.cpp2
-rw-r--r--engines/titanic/sound/restricted_auto_music_player.h2
-rw-r--r--engines/titanic/sound/room_auto_sound_player.cpp2
-rw-r--r--engines/titanic/sound/room_auto_sound_player.h2
-rw-r--r--engines/titanic/sound/room_trigger_auto_music_player.cpp2
-rw-r--r--engines/titanic/sound/room_trigger_auto_music_player.h2
-rw-r--r--engines/titanic/sound/titania_speech.cpp2
-rw-r--r--engines/titanic/sound/titania_speech.h2
14 files changed, 14 insertions, 14 deletions
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) {}