From 5c2a39e74ac1cf8b67e17fe25e00bcca487c9f99 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 28 Jun 2016 21:18:13 -0400 Subject: TITANIC: Set up empty message targets for classes without messages --- engines/titanic/gfx/chev_left_off.cpp | 2 ++ engines/titanic/gfx/chev_left_off.h | 1 + engines/titanic/gfx/chev_left_on.cpp | 2 ++ engines/titanic/gfx/chev_left_on.h | 1 + engines/titanic/gfx/chev_right_off.cpp | 2 ++ engines/titanic/gfx/chev_right_off.h | 1 + engines/titanic/gfx/chev_right_on.cpp | 2 ++ engines/titanic/gfx/chev_right_on.h | 1 + engines/titanic/gfx/chev_send_rec_switch.cpp | 2 ++ engines/titanic/gfx/chev_send_rec_switch.h | 1 + engines/titanic/gfx/elevator_button.cpp | 2 ++ engines/titanic/gfx/elevator_button.h | 1 + engines/titanic/gfx/get_from_succ.cpp | 2 ++ engines/titanic/gfx/get_from_succ.h | 1 + engines/titanic/gfx/helmet_on_off.cpp | 2 ++ engines/titanic/gfx/helmet_on_off.h | 1 + engines/titanic/gfx/home_photo.cpp | 2 ++ engines/titanic/gfx/home_photo.h | 1 + engines/titanic/gfx/icon_nav_action.cpp | 2 ++ engines/titanic/gfx/icon_nav_action.h | 1 + engines/titanic/gfx/icon_nav_butt.cpp | 2 ++ engines/titanic/gfx/icon_nav_butt.h | 1 + engines/titanic/gfx/icon_nav_down.cpp | 2 ++ engines/titanic/gfx/icon_nav_down.h | 1 + engines/titanic/gfx/icon_nav_image.cpp | 2 ++ engines/titanic/gfx/icon_nav_image.h | 1 + engines/titanic/gfx/icon_nav_left.cpp | 2 ++ engines/titanic/gfx/icon_nav_left.h | 1 + engines/titanic/gfx/icon_nav_receive.cpp | 2 ++ engines/titanic/gfx/icon_nav_receive.h | 1 + engines/titanic/gfx/icon_nav_right.cpp | 2 ++ engines/titanic/gfx/icon_nav_right.h | 1 + engines/titanic/gfx/icon_nav_send.cpp | 2 ++ engines/titanic/gfx/icon_nav_send.h | 1 + engines/titanic/gfx/icon_nav_up.cpp | 2 ++ engines/titanic/gfx/icon_nav_up.h | 1 + engines/titanic/gfx/keybrd_butt.cpp | 2 ++ engines/titanic/gfx/keybrd_butt.h | 1 + engines/titanic/gfx/music_slider.cpp | 39 ++++++++++++++++++++++++++++ engines/titanic/gfx/music_slider.h | 11 +++----- engines/titanic/gfx/music_switch.cpp | 39 ++++++++++++++++++++++++++++ engines/titanic/gfx/music_switch.h | 11 +++----- engines/titanic/gfx/send_to_succ.cpp | 2 ++ engines/titanic/gfx/send_to_succ.h | 1 + engines/titanic/gfx/sgt_selector.cpp | 2 ++ engines/titanic/gfx/sgt_selector.h | 1 + engines/titanic/gfx/small_chev_left_off.cpp | 2 ++ engines/titanic/gfx/small_chev_left_off.h | 1 + engines/titanic/gfx/small_chev_left_on.cpp | 2 ++ engines/titanic/gfx/small_chev_left_on.h | 1 + engines/titanic/gfx/small_chev_right_off.cpp | 2 ++ engines/titanic/gfx/small_chev_right_off.h | 1 + engines/titanic/gfx/small_chev_right_on.cpp | 2 ++ engines/titanic/gfx/small_chev_right_on.h | 1 + engines/titanic/gfx/text_down.cpp | 2 ++ engines/titanic/gfx/text_down.h | 1 + engines/titanic/gfx/text_skrew.cpp | 2 ++ engines/titanic/gfx/text_skrew.h | 1 + engines/titanic/gfx/text_up.cpp | 2 ++ engines/titanic/gfx/text_up.h | 1 + engines/titanic/gfx/toggle_button.cpp | 2 ++ engines/titanic/gfx/toggle_button.h | 1 + 62 files changed, 171 insertions(+), 16 deletions(-) create mode 100644 engines/titanic/gfx/music_slider.cpp create mode 100644 engines/titanic/gfx/music_switch.cpp (limited to 'engines/titanic/gfx') diff --git a/engines/titanic/gfx/chev_left_off.cpp b/engines/titanic/gfx/chev_left_off.cpp index 736cc0d6c4..0ce2d62af3 100644 --- a/engines/titanic/gfx/chev_left_off.cpp +++ b/engines/titanic/gfx/chev_left_off.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CChevLeftOff, CToggleSwitch) + CChevLeftOff::CChevLeftOff() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/chev_left_off.h b/engines/titanic/gfx/chev_left_off.h index 753aba3be0..36a9d2c3ad 100644 --- a/engines/titanic/gfx/chev_left_off.h +++ b/engines/titanic/gfx/chev_left_off.h @@ -28,6 +28,7 @@ namespace Titanic { class CChevLeftOff : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CChevLeftOff(); diff --git a/engines/titanic/gfx/chev_left_on.cpp b/engines/titanic/gfx/chev_left_on.cpp index f233c53a43..c3264b794b 100644 --- a/engines/titanic/gfx/chev_left_on.cpp +++ b/engines/titanic/gfx/chev_left_on.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CChevLeftOn, CToggleSwitch) + CChevLeftOn::CChevLeftOn() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/chev_left_on.h b/engines/titanic/gfx/chev_left_on.h index 99126d792c..0de814bfcc 100644 --- a/engines/titanic/gfx/chev_left_on.h +++ b/engines/titanic/gfx/chev_left_on.h @@ -28,6 +28,7 @@ namespace Titanic { class CChevLeftOn : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CChevLeftOn(); diff --git a/engines/titanic/gfx/chev_right_off.cpp b/engines/titanic/gfx/chev_right_off.cpp index 7cf3b11d19..60ed2de30c 100644 --- a/engines/titanic/gfx/chev_right_off.cpp +++ b/engines/titanic/gfx/chev_right_off.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CChevRightOff, CToggleSwitch) + CChevRightOff::CChevRightOff() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/chev_right_off.h b/engines/titanic/gfx/chev_right_off.h index 1a31007f19..3714c2b386 100644 --- a/engines/titanic/gfx/chev_right_off.h +++ b/engines/titanic/gfx/chev_right_off.h @@ -28,6 +28,7 @@ namespace Titanic { class CChevRightOff : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CChevRightOff(); diff --git a/engines/titanic/gfx/chev_right_on.cpp b/engines/titanic/gfx/chev_right_on.cpp index 848abfc005..ac55100ed6 100644 --- a/engines/titanic/gfx/chev_right_on.cpp +++ b/engines/titanic/gfx/chev_right_on.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CChevRightOn, CToggleSwitch) + CChevRightOn::CChevRightOn() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/chev_right_on.h b/engines/titanic/gfx/chev_right_on.h index 084b02ea08..d72c34a895 100644 --- a/engines/titanic/gfx/chev_right_on.h +++ b/engines/titanic/gfx/chev_right_on.h @@ -28,6 +28,7 @@ namespace Titanic { class CChevRightOn : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CChevRightOn(); diff --git a/engines/titanic/gfx/chev_send_rec_switch.cpp b/engines/titanic/gfx/chev_send_rec_switch.cpp index affe9bce8f..d0d4a819a3 100644 --- a/engines/titanic/gfx/chev_send_rec_switch.cpp +++ b/engines/titanic/gfx/chev_send_rec_switch.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CChevSendRecSwitch, CToggleSwitch) + CChevSendRecSwitch::CChevSendRecSwitch() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/chev_send_rec_switch.h b/engines/titanic/gfx/chev_send_rec_switch.h index 29d6e7ab82..2f51bae259 100644 --- a/engines/titanic/gfx/chev_send_rec_switch.h +++ b/engines/titanic/gfx/chev_send_rec_switch.h @@ -28,6 +28,7 @@ namespace Titanic { class CChevSendRecSwitch : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CChevSendRecSwitch(); diff --git a/engines/titanic/gfx/elevator_button.cpp b/engines/titanic/gfx/elevator_button.cpp index 81c9598b03..2a599ca491 100644 --- a/engines/titanic/gfx/elevator_button.cpp +++ b/engines/titanic/gfx/elevator_button.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CElevatorButton, CSTButton) + CElevatorButton::CElevatorButton() : CSTButton() { } diff --git a/engines/titanic/gfx/elevator_button.h b/engines/titanic/gfx/elevator_button.h index dddb7077b3..d6bf5dc3d6 100644 --- a/engines/titanic/gfx/elevator_button.h +++ b/engines/titanic/gfx/elevator_button.h @@ -28,6 +28,7 @@ namespace Titanic { class CElevatorButton : public CSTButton { + DECLARE_MESSAGE_MAP public: CLASSDEF CElevatorButton(); diff --git a/engines/titanic/gfx/get_from_succ.cpp b/engines/titanic/gfx/get_from_succ.cpp index ad7b5dc2e8..c7a59fd97d 100644 --- a/engines/titanic/gfx/get_from_succ.cpp +++ b/engines/titanic/gfx/get_from_succ.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CGetFromSucc, CToggleSwitch) + CGetFromSucc::CGetFromSucc() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/get_from_succ.h b/engines/titanic/gfx/get_from_succ.h index f0b028afa0..dc611f140f 100644 --- a/engines/titanic/gfx/get_from_succ.h +++ b/engines/titanic/gfx/get_from_succ.h @@ -28,6 +28,7 @@ namespace Titanic { class CGetFromSucc : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CGetFromSucc(); diff --git a/engines/titanic/gfx/helmet_on_off.cpp b/engines/titanic/gfx/helmet_on_off.cpp index e1c698932e..29131778cb 100644 --- a/engines/titanic/gfx/helmet_on_off.cpp +++ b/engines/titanic/gfx/helmet_on_off.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CHelmetOnOff, CToggleSwitch) + CHelmetOnOff::CHelmetOnOff() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/helmet_on_off.h b/engines/titanic/gfx/helmet_on_off.h index 41621f340e..f607b47c0c 100644 --- a/engines/titanic/gfx/helmet_on_off.h +++ b/engines/titanic/gfx/helmet_on_off.h @@ -28,6 +28,7 @@ namespace Titanic { class CHelmetOnOff : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CHelmetOnOff(); diff --git a/engines/titanic/gfx/home_photo.cpp b/engines/titanic/gfx/home_photo.cpp index 48661fc70d..303e56d1ca 100644 --- a/engines/titanic/gfx/home_photo.cpp +++ b/engines/titanic/gfx/home_photo.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CHomePhoto, CToggleSwitch) + CHomePhoto::CHomePhoto() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/home_photo.h b/engines/titanic/gfx/home_photo.h index 6e6f4976a2..db0be89a77 100644 --- a/engines/titanic/gfx/home_photo.h +++ b/engines/titanic/gfx/home_photo.h @@ -28,6 +28,7 @@ namespace Titanic { class CHomePhoto : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CHomePhoto(); diff --git a/engines/titanic/gfx/icon_nav_action.cpp b/engines/titanic/gfx/icon_nav_action.cpp index f8aaa72396..e66c345bf5 100644 --- a/engines/titanic/gfx/icon_nav_action.cpp +++ b/engines/titanic/gfx/icon_nav_action.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavAction, CToggleSwitch) + CIconNavAction::CIconNavAction() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/icon_nav_action.h b/engines/titanic/gfx/icon_nav_action.h index cb8fae932a..189ea357e4 100644 --- a/engines/titanic/gfx/icon_nav_action.h +++ b/engines/titanic/gfx/icon_nav_action.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavAction : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CIconNavAction(); diff --git a/engines/titanic/gfx/icon_nav_butt.cpp b/engines/titanic/gfx/icon_nav_butt.cpp index 85eb1304c2..820a4270d4 100644 --- a/engines/titanic/gfx/icon_nav_butt.cpp +++ b/engines/titanic/gfx/icon_nav_butt.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavButt, CPetGraphic) + void CIconNavButt::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); CPetGraphic::save(file, indent); diff --git a/engines/titanic/gfx/icon_nav_butt.h b/engines/titanic/gfx/icon_nav_butt.h index b2db4c7794..0cb2f1a3b1 100644 --- a/engines/titanic/gfx/icon_nav_butt.h +++ b/engines/titanic/gfx/icon_nav_butt.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavButt : public CPetGraphic { + DECLARE_MESSAGE_MAP public: CLASSDEF diff --git a/engines/titanic/gfx/icon_nav_down.cpp b/engines/titanic/gfx/icon_nav_down.cpp index 947aa4c4f0..78727a3e8b 100644 --- a/engines/titanic/gfx/icon_nav_down.cpp +++ b/engines/titanic/gfx/icon_nav_down.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavDown, CToggleSwitch) + CIconNavDown::CIconNavDown() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/icon_nav_down.h b/engines/titanic/gfx/icon_nav_down.h index b7759e059d..3eef9ef7f1 100644 --- a/engines/titanic/gfx/icon_nav_down.h +++ b/engines/titanic/gfx/icon_nav_down.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavDown : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CIconNavDown(); diff --git a/engines/titanic/gfx/icon_nav_image.cpp b/engines/titanic/gfx/icon_nav_image.cpp index 1e8a1ca2c3..d0c6239dcd 100644 --- a/engines/titanic/gfx/icon_nav_image.cpp +++ b/engines/titanic/gfx/icon_nav_image.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavImage, CPetGraphic) + void CIconNavImage::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); CPetGraphic::save(file, indent); diff --git a/engines/titanic/gfx/icon_nav_image.h b/engines/titanic/gfx/icon_nav_image.h index 295ffe7d3b..8460733a12 100644 --- a/engines/titanic/gfx/icon_nav_image.h +++ b/engines/titanic/gfx/icon_nav_image.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavImage : public CPetGraphic { + DECLARE_MESSAGE_MAP public: CLASSDEF diff --git a/engines/titanic/gfx/icon_nav_left.cpp b/engines/titanic/gfx/icon_nav_left.cpp index 5ec50904d2..803818f19f 100644 --- a/engines/titanic/gfx/icon_nav_left.cpp +++ b/engines/titanic/gfx/icon_nav_left.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavLeft, CToggleSwitch) + CIconNavLeft::CIconNavLeft() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/icon_nav_left.h b/engines/titanic/gfx/icon_nav_left.h index e507d2c2dd..5fd7b65a83 100644 --- a/engines/titanic/gfx/icon_nav_left.h +++ b/engines/titanic/gfx/icon_nav_left.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavLeft : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CIconNavLeft(); diff --git a/engines/titanic/gfx/icon_nav_receive.cpp b/engines/titanic/gfx/icon_nav_receive.cpp index ad7e0e7160..554656cf0a 100644 --- a/engines/titanic/gfx/icon_nav_receive.cpp +++ b/engines/titanic/gfx/icon_nav_receive.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavReceive, CPetGraphic) + void CIconNavReceive::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); CPetGraphic::save(file, indent); diff --git a/engines/titanic/gfx/icon_nav_receive.h b/engines/titanic/gfx/icon_nav_receive.h index 36eed5376b..f181439289 100644 --- a/engines/titanic/gfx/icon_nav_receive.h +++ b/engines/titanic/gfx/icon_nav_receive.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavReceive : public CPetGraphic { + DECLARE_MESSAGE_MAP public: CLASSDEF diff --git a/engines/titanic/gfx/icon_nav_right.cpp b/engines/titanic/gfx/icon_nav_right.cpp index d133ed3b81..1553c9127c 100644 --- a/engines/titanic/gfx/icon_nav_right.cpp +++ b/engines/titanic/gfx/icon_nav_right.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavRight, CToggleSwitch) + CIconNavRight::CIconNavRight() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/icon_nav_right.h b/engines/titanic/gfx/icon_nav_right.h index db3bab4bb8..c088a2334a 100644 --- a/engines/titanic/gfx/icon_nav_right.h +++ b/engines/titanic/gfx/icon_nav_right.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavRight : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CIconNavRight(); diff --git a/engines/titanic/gfx/icon_nav_send.cpp b/engines/titanic/gfx/icon_nav_send.cpp index 856560c175..64d2a8660e 100644 --- a/engines/titanic/gfx/icon_nav_send.cpp +++ b/engines/titanic/gfx/icon_nav_send.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavSend, CPetGraphic) + void CIconNavSend::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); CPetGraphic::save(file, indent); diff --git a/engines/titanic/gfx/icon_nav_send.h b/engines/titanic/gfx/icon_nav_send.h index d25d0b9149..41c747edad 100644 --- a/engines/titanic/gfx/icon_nav_send.h +++ b/engines/titanic/gfx/icon_nav_send.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavSend : public CPetGraphic { + DECLARE_MESSAGE_MAP public: CLASSDEF diff --git a/engines/titanic/gfx/icon_nav_up.cpp b/engines/titanic/gfx/icon_nav_up.cpp index 5b5d5ec9f0..a8f4f552b5 100644 --- a/engines/titanic/gfx/icon_nav_up.cpp +++ b/engines/titanic/gfx/icon_nav_up.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CIconNavUp, CToggleSwitch) + CIconNavUp::CIconNavUp() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/icon_nav_up.h b/engines/titanic/gfx/icon_nav_up.h index 7eeeb773b1..691e6652e7 100644 --- a/engines/titanic/gfx/icon_nav_up.h +++ b/engines/titanic/gfx/icon_nav_up.h @@ -28,6 +28,7 @@ namespace Titanic { class CIconNavUp : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CIconNavUp(); diff --git a/engines/titanic/gfx/keybrd_butt.cpp b/engines/titanic/gfx/keybrd_butt.cpp index 3e7f5c19de..4a18d99f0a 100644 --- a/engines/titanic/gfx/keybrd_butt.cpp +++ b/engines/titanic/gfx/keybrd_butt.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CKeybrdButt, CToggleSwitch) + CKeybrdButt::CKeybrdButt() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/keybrd_butt.h b/engines/titanic/gfx/keybrd_butt.h index a4f233b209..33ff418c56 100644 --- a/engines/titanic/gfx/keybrd_butt.h +++ b/engines/titanic/gfx/keybrd_butt.h @@ -28,6 +28,7 @@ namespace Titanic { class CKeybrdButt : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CKeybrdButt(); diff --git a/engines/titanic/gfx/music_slider.cpp b/engines/titanic/gfx/music_slider.cpp new file mode 100644 index 0000000000..f065ae6729 --- /dev/null +++ b/engines/titanic/gfx/music_slider.cpp @@ -0,0 +1,39 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "titanic/gfx/music_slider.h" + +namespace Titanic { + +EMPTY_MESSAGE_MAP(CMusicSlider, CMusicControl) + +void CMusicSlider::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + CMusicControl::save(file, indent); +} + +void CMusicSlider::load(SimpleFile *file) { + file->readNumber(); + CMusicControl::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/gfx/music_slider.h b/engines/titanic/gfx/music_slider.h index 3fd0ab341e..b396074b00 100644 --- a/engines/titanic/gfx/music_slider.h +++ b/engines/titanic/gfx/music_slider.h @@ -28,24 +28,19 @@ namespace Titanic { class CMusicSlider : public CMusicControl { + DECLARE_MESSAGE_MAP public: CLASSDEF /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const { - file->writeNumberLine(1, indent); - CMusicControl::save(file, indent); - } + virtual void save(SimpleFile *file, int indent) const; /** * Load the data for the class from file */ - virtual void load(SimpleFile *file) { - file->readNumber(); - CMusicControl::load(file); - } + virtual void load(SimpleFile *file); }; } // End of namespace Titanic diff --git a/engines/titanic/gfx/music_switch.cpp b/engines/titanic/gfx/music_switch.cpp new file mode 100644 index 0000000000..69e8f2eb4c --- /dev/null +++ b/engines/titanic/gfx/music_switch.cpp @@ -0,0 +1,39 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "titanic/gfx/music_switch.h" + +namespace Titanic { + +EMPTY_MESSAGE_MAP(CMusicSwitch, CMusicControl) + +void CMusicSwitch::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + CMusicControl::save(file, indent); +} + +void CMusicSwitch::load(SimpleFile *file) { + file->readNumber(); + CMusicControl::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/gfx/music_switch.h b/engines/titanic/gfx/music_switch.h index 534eb251de..bd9397e041 100644 --- a/engines/titanic/gfx/music_switch.h +++ b/engines/titanic/gfx/music_switch.h @@ -28,24 +28,19 @@ namespace Titanic { class CMusicSwitch : public CMusicControl { + DECLARE_MESSAGE_MAP public: CLASSDEF /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const { - file->writeNumberLine(1, indent); - CMusicControl::save(file, indent); - } + virtual void save(SimpleFile *file, int indent) const; /** * Load the data for the class from file */ - virtual void load(SimpleFile *file) { - file->readNumber(); - CMusicControl::load(file); - } + virtual void load(SimpleFile *file); }; } // End of namespace Titanic diff --git a/engines/titanic/gfx/send_to_succ.cpp b/engines/titanic/gfx/send_to_succ.cpp index 82c923c045..938fa7c3a9 100644 --- a/engines/titanic/gfx/send_to_succ.cpp +++ b/engines/titanic/gfx/send_to_succ.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CSendToSucc, CToggleSwitch) + CSendToSucc::CSendToSucc() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/send_to_succ.h b/engines/titanic/gfx/send_to_succ.h index fb237f206d..65868cd83d 100644 --- a/engines/titanic/gfx/send_to_succ.h +++ b/engines/titanic/gfx/send_to_succ.h @@ -28,6 +28,7 @@ namespace Titanic { class CSendToSucc : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CSendToSucc(); diff --git a/engines/titanic/gfx/sgt_selector.cpp b/engines/titanic/gfx/sgt_selector.cpp index 7ad126b60a..170b0f4712 100644 --- a/engines/titanic/gfx/sgt_selector.cpp +++ b/engines/titanic/gfx/sgt_selector.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CSGTSelector, CPetGraphic) + void CSGTSelector::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); CPetGraphic::save(file, indent); diff --git a/engines/titanic/gfx/sgt_selector.h b/engines/titanic/gfx/sgt_selector.h index 8ebd7ae255..82757fa3b9 100644 --- a/engines/titanic/gfx/sgt_selector.h +++ b/engines/titanic/gfx/sgt_selector.h @@ -28,6 +28,7 @@ namespace Titanic { class CSGTSelector : public CPetGraphic { + DECLARE_MESSAGE_MAP public: CLASSDEF diff --git a/engines/titanic/gfx/small_chev_left_off.cpp b/engines/titanic/gfx/small_chev_left_off.cpp index 8614e336e1..8647ad8fe4 100644 --- a/engines/titanic/gfx/small_chev_left_off.cpp +++ b/engines/titanic/gfx/small_chev_left_off.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CSmallChevLeftOff, CToggleSwitch) + CSmallChevLeftOff::CSmallChevLeftOff() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/small_chev_left_off.h b/engines/titanic/gfx/small_chev_left_off.h index fc500cee69..27c40017ad 100644 --- a/engines/titanic/gfx/small_chev_left_off.h +++ b/engines/titanic/gfx/small_chev_left_off.h @@ -28,6 +28,7 @@ namespace Titanic { class CSmallChevLeftOff : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CSmallChevLeftOff(); diff --git a/engines/titanic/gfx/small_chev_left_on.cpp b/engines/titanic/gfx/small_chev_left_on.cpp index 7f6a4ee3db..b5031e922e 100644 --- a/engines/titanic/gfx/small_chev_left_on.cpp +++ b/engines/titanic/gfx/small_chev_left_on.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CSmallChevLeftOn, CToggleSwitch) + CSmallChevLeftOn::CSmallChevLeftOn() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/small_chev_left_on.h b/engines/titanic/gfx/small_chev_left_on.h index 8ab9417468..7b60857e67 100644 --- a/engines/titanic/gfx/small_chev_left_on.h +++ b/engines/titanic/gfx/small_chev_left_on.h @@ -28,6 +28,7 @@ namespace Titanic { class CSmallChevLeftOn : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CSmallChevLeftOn(); diff --git a/engines/titanic/gfx/small_chev_right_off.cpp b/engines/titanic/gfx/small_chev_right_off.cpp index 1a3051bb4d..6d0c08eb8e 100644 --- a/engines/titanic/gfx/small_chev_right_off.cpp +++ b/engines/titanic/gfx/small_chev_right_off.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CSmallChevRightOff, CToggleSwitch) + CSmallChevRightOff::CSmallChevRightOff() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/small_chev_right_off.h b/engines/titanic/gfx/small_chev_right_off.h index fae9c3c674..0dadae1e07 100644 --- a/engines/titanic/gfx/small_chev_right_off.h +++ b/engines/titanic/gfx/small_chev_right_off.h @@ -28,6 +28,7 @@ namespace Titanic { class CSmallChevRightOff : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CSmallChevRightOff(); diff --git a/engines/titanic/gfx/small_chev_right_on.cpp b/engines/titanic/gfx/small_chev_right_on.cpp index 714b6b314b..552990d0b8 100644 --- a/engines/titanic/gfx/small_chev_right_on.cpp +++ b/engines/titanic/gfx/small_chev_right_on.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CSmallChevRightOn, CToggleSwitch) + CSmallChevRightOn::CSmallChevRightOn() : CToggleSwitch() { } diff --git a/engines/titanic/gfx/small_chev_right_on.h b/engines/titanic/gfx/small_chev_right_on.h index c5cb4d792d..ea042d30ee 100644 --- a/engines/titanic/gfx/small_chev_right_on.h +++ b/engines/titanic/gfx/small_chev_right_on.h @@ -28,6 +28,7 @@ namespace Titanic { class CSmallChevRightOn : public CToggleSwitch { + DECLARE_MESSAGE_MAP public: CLASSDEF CSmallChevRightOn(); diff --git a/engines/titanic/gfx/text_down.cpp b/engines/titanic/gfx/text_down.cpp index d4bdfdb72f..967d60f495 100644 --- a/engines/titanic/gfx/text_down.cpp +++ b/engines/titanic/gfx/text_down.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CTextDown, CPetGraphic) + void CTextDown::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); CPetGraphic::save(file, indent); diff --git a/engines/titanic/gfx/text_down.h b/engines/titanic/gfx/text_down.h index 189f795650..920ea8c958 100644 --- a/engines/titanic/gfx/text_down.h +++ b/engines/titanic/gfx/text_down.h @@ -28,6 +28,7 @@ namespace Titanic { class CTextDown : public CPetGraphic { + DECLARE_MESSAGE_MAP public: CLASSDEF diff --git a/engines/titanic/gfx/text_skrew.cpp b/engines/titanic/gfx/text_skrew.cpp index 8d1f026913..30cc7f407b 100644 --- a/engines/titanic/gfx/text_skrew.cpp +++ b/engines/titanic/gfx/text_skrew.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CTextSkrew, CPetGraphic) + void CTextSkrew::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); CPetGraphic::save(file, indent); diff --git a/engines/titanic/gfx/text_skrew.h b/engines/titanic/gfx/text_skrew.h index aa6c375098..6e86e70825 100644 --- a/engines/titanic/gfx/text_skrew.h +++ b/engines/titanic/gfx/text_skrew.h @@ -28,6 +28,7 @@ namespace Titanic { class CTextSkrew : public CPetGraphic { + DECLARE_MESSAGE_MAP public: CLASSDEF diff --git a/engines/titanic/gfx/text_up.cpp b/engines/titanic/gfx/text_up.cpp index ce3ff100dc..0cb4153f25 100644 --- a/engines/titanic/gfx/text_up.cpp +++ b/engines/titanic/gfx/text_up.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CTextUp, CPetGraphic) + void CTextUp::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); CPetGraphic::save(file, indent); diff --git a/engines/titanic/gfx/text_up.h b/engines/titanic/gfx/text_up.h index 103f62159c..05a54bc45a 100644 --- a/engines/titanic/gfx/text_up.h +++ b/engines/titanic/gfx/text_up.h @@ -28,6 +28,7 @@ namespace Titanic { class CTextUp : public CPetGraphic { + DECLARE_MESSAGE_MAP public: CLASSDEF diff --git a/engines/titanic/gfx/toggle_button.cpp b/engines/titanic/gfx/toggle_button.cpp index 8284d35aac..3bb2e967e9 100644 --- a/engines/titanic/gfx/toggle_button.cpp +++ b/engines/titanic/gfx/toggle_button.cpp @@ -24,6 +24,8 @@ namespace Titanic { +EMPTY_MESSAGE_MAP(CToggleButton, CBackground) + void CToggleButton::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); file->writeNumberLine(_fieldE0, indent); diff --git a/engines/titanic/gfx/toggle_button.h b/engines/titanic/gfx/toggle_button.h index a98a94df9e..ac0bb69b9d 100644 --- a/engines/titanic/gfx/toggle_button.h +++ b/engines/titanic/gfx/toggle_button.h @@ -28,6 +28,7 @@ namespace Titanic { class CToggleButton : public CBackground { + DECLARE_MESSAGE_MAP private: int _fieldE0; public: -- cgit v1.2.3