From 63db0980e5f48764667863afe15b8f43b386c1a8 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Thu, 25 Feb 2016 08:48:21 -0500 Subject: TITANIC: Rename of sub-folders for better clarity --- engines/titanic/game/announce.h | 57 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 engines/titanic/game/announce.h (limited to 'engines/titanic/game/announce.h') diff --git a/engines/titanic/game/announce.h b/engines/titanic/game/announce.h new file mode 100644 index 0000000000..baa5f1a55a --- /dev/null +++ b/engines/titanic/game/announce.h @@ -0,0 +1,57 @@ +/* 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. + * + */ + +#ifndef TITANIC_ANNOUNCE_H +#define TITANIC_ANNOUNCE_H + +#include "titanic/core/game_object.h" + +namespace Titanic { + +class CAnnounce : public CGameObject { +private: + int _fieldBC; + int _fieldC0; + int _fieldC4; + int _fieldC8; +public: + CAnnounce(); + + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CAnnounce"; } + + /** + * Save the data for the class to file + */ + virtual void save(SimpleFile *file, int indent) const; + + /** + * Load the data for the class from file + */ + virtual void load(SimpleFile *file); +}; + +} // End of namespace Titanic + +#endif /* TITANIC_ROOM_ITEM_H */ -- cgit v1.2.3 From 7375394b810f3503f168d5770555aa1932d7892d Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 6 Mar 2016 19:12:49 -0500 Subject: TITANIC: Converting saveable objects hierarchy to have type data This is necessary for at least message sending, and probably other areas, that needs to be able to pass class filtering for message targets. And I could figure out a clean way to use the built-in RTTI --- engines/titanic/game/announce.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'engines/titanic/game/announce.h') diff --git a/engines/titanic/game/announce.h b/engines/titanic/game/announce.h index baa5f1a55a..18702c3baf 100644 --- a/engines/titanic/game/announce.h +++ b/engines/titanic/game/announce.h @@ -34,13 +34,9 @@ private: int _fieldC4; int _fieldC8; public: + CLASSDEF CAnnounce(); - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CAnnounce"; } - /** * Save the data for the class to file */ -- cgit v1.2.3 From 5ccc0a66da38d23520234e7060efaf966d3345b9 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 29 Jun 2016 19:53:16 -0400 Subject: TITANIC: Removed const modifier from all saveable objects Turns out that CGameObject::save regenerates the _movieRangeInfo list. So the const suffix can no longer be used for the entire hierarchy --- engines/titanic/game/announce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/game/announce.h') diff --git a/engines/titanic/game/announce.h b/engines/titanic/game/announce.h index 18702c3baf..3845d96deb 100644 --- a/engines/titanic/game/announce.h +++ b/engines/titanic/game/announce.h @@ -40,7 +40,7 @@ public: /** * Save the data for the class to file */ - virtual void save(SimpleFile *file, int indent) const; + virtual void save(SimpleFile *file, int indent); /** * Load the data for the class from file -- cgit v1.2.3 From 4d79ee16c07e2398e9058fe93947b4704cd6048a Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 24 Jul 2016 20:30:56 -0400 Subject: TITANIC: Add semicolon after CLASSDEF macro usage --- engines/titanic/game/announce.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/game/announce.h') diff --git a/engines/titanic/game/announce.h b/engines/titanic/game/announce.h index 3845d96deb..f960241c36 100644 --- a/engines/titanic/game/announce.h +++ b/engines/titanic/game/announce.h @@ -34,7 +34,7 @@ private: int _fieldC4; int _fieldC8; public: - CLASSDEF + CLASSDEF; CAnnounce(); /** -- cgit v1.2.3 From 4f8c31ecf7c8ac71e1be65771ce508fb11c62749 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 12 Aug 2016 22:43:14 -0400 Subject: TITANIC: Implemented CAnnounce and CActButton classes --- engines/titanic/game/announce.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'engines/titanic/game/announce.h') diff --git a/engines/titanic/game/announce.h b/engines/titanic/game/announce.h index f960241c36..9bf060daae 100644 --- a/engines/titanic/game/announce.h +++ b/engines/titanic/game/announce.h @@ -28,11 +28,15 @@ namespace Titanic { class CAnnounce : public CGameObject { + DECLARE_MESSAGE_MAP; + bool TimerMsg(CTimerMsg *msg); + bool LeaveRoomMsg(CLeaveRoomMsg *msg); + bool ActMsg(CActMsg *msg); private: - int _fieldBC; - int _fieldC0; - int _fieldC4; - int _fieldC8; + int _nameIndex; + int _soundHandle; + bool _leaveFlag; + bool _enabled; public: CLASSDEF; CAnnounce(); -- cgit v1.2.3