From f7e057e4d74a7f38ac40024bba29ebc0071975c5 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 1 Mar 2016 23:40:59 -0500 Subject: TITANIC: Added more miscellaneous classes --- engines/titanic/game/placeholder/tv_on_bar.h | 52 ++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 engines/titanic/game/placeholder/tv_on_bar.h (limited to 'engines/titanic/game/placeholder/tv_on_bar.h') diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h new file mode 100644 index 0000000000..1583dad05a --- /dev/null +++ b/engines/titanic/game/placeholder/tv_on_bar.h @@ -0,0 +1,52 @@ +/* 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_TV_ON_BAR_H +#define TITANIC_TV_ON_BAR_H + +#include "titanic/game/placeholder/place_holder.h" + +namespace Titanic { + +class CTVOnBar : public CPlaceHolder { +private: + Common::Point _pos1; +public: + /** + * Return the class name + */ + virtual const char *getClassName() const { return "CTVOnBar"; } + + /** + * 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_TV_ON_BAR_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/placeholder/tv_on_bar.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'engines/titanic/game/placeholder/tv_on_bar.h') diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h index 1583dad05a..3358cd6fec 100644 --- a/engines/titanic/game/placeholder/tv_on_bar.h +++ b/engines/titanic/game/placeholder/tv_on_bar.h @@ -31,10 +31,7 @@ class CTVOnBar : public CPlaceHolder { private: Common::Point _pos1; public: - /** - * Return the class name - */ - virtual const char *getClassName() const { return "CTVOnBar"; } + CLASSDEF /** * Save the data for the class to file -- cgit v1.2.3 From 217360d0c5a0b8289c16b22fc46782c475fcc9f5 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Mon, 21 Mar 2016 20:53:49 -0400 Subject: TITANIC: Add new derived Rect and Point classes --- engines/titanic/game/placeholder/tv_on_bar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/game/placeholder/tv_on_bar.h') diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h index 3358cd6fec..3af59deb5b 100644 --- a/engines/titanic/game/placeholder/tv_on_bar.h +++ b/engines/titanic/game/placeholder/tv_on_bar.h @@ -29,7 +29,7 @@ namespace Titanic { class CTVOnBar : public CPlaceHolder { private: - Common::Point _pos1; + Point _pos1; public: CLASSDEF -- cgit v1.2.3 From 243a3e6a7dbedf5960a20b7028263310fb5ab27a Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sat, 25 Jun 2016 17:16:07 -0400 Subject: TITANIC: Rename CPlaceHolder to CPlaceHolderItem to match original --- engines/titanic/game/placeholder/tv_on_bar.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/titanic/game/placeholder/tv_on_bar.h') diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h index 3af59deb5b..2cc5494464 100644 --- a/engines/titanic/game/placeholder/tv_on_bar.h +++ b/engines/titanic/game/placeholder/tv_on_bar.h @@ -23,11 +23,11 @@ #ifndef TITANIC_TV_ON_BAR_H #define TITANIC_TV_ON_BAR_H -#include "titanic/game/placeholder/place_holder.h" +#include "titanic/game/placeholder/place_holder_item.h" namespace Titanic { -class CTVOnBar : public CPlaceHolder { +class CTVOnBar : public CPlaceHolderItem { private: Point _pos1; public: -- 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/placeholder/tv_on_bar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/game/placeholder/tv_on_bar.h') diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h index 2cc5494464..ffe8109a9b 100644 --- a/engines/titanic/game/placeholder/tv_on_bar.h +++ b/engines/titanic/game/placeholder/tv_on_bar.h @@ -36,7 +36,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/placeholder/tv_on_bar.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engines/titanic/game/placeholder/tv_on_bar.h') diff --git a/engines/titanic/game/placeholder/tv_on_bar.h b/engines/titanic/game/placeholder/tv_on_bar.h index ffe8109a9b..d41d972e73 100644 --- a/engines/titanic/game/placeholder/tv_on_bar.h +++ b/engines/titanic/game/placeholder/tv_on_bar.h @@ -31,7 +31,7 @@ class CTVOnBar : public CPlaceHolderItem { private: Point _pos1; public: - CLASSDEF + CLASSDEF; /** * Save the data for the class to file -- cgit v1.2.3