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 --- .../game/placeholder/bar_shelf_vis_centre.cpp | 4 +- .../game/placeholder/bar_shelf_vis_centre.h | 6 +-- engines/titanic/game/placeholder/lemon_on_bar.cpp | 4 +- engines/titanic/game/placeholder/lemon_on_bar.h | 4 +- engines/titanic/game/placeholder/place_holder.cpp | 37 ----------------- engines/titanic/game/placeholder/place_holder.h | 47 ---------------------- .../titanic/game/placeholder/place_holder_item.cpp | 37 +++++++++++++++++ .../titanic/game/placeholder/place_holder_item.h | 47 ++++++++++++++++++++++ engines/titanic/game/placeholder/tv_on_bar.cpp | 4 +- engines/titanic/game/placeholder/tv_on_bar.h | 4 +- 10 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 engines/titanic/game/placeholder/place_holder.cpp delete mode 100644 engines/titanic/game/placeholder/place_holder.h create mode 100644 engines/titanic/game/placeholder/place_holder_item.cpp create mode 100644 engines/titanic/game/placeholder/place_holder_item.h (limited to 'engines/titanic/game/placeholder') diff --git a/engines/titanic/game/placeholder/bar_shelf_vis_centre.cpp b/engines/titanic/game/placeholder/bar_shelf_vis_centre.cpp index 3d3a05692f..f3eda053f1 100644 --- a/engines/titanic/game/placeholder/bar_shelf_vis_centre.cpp +++ b/engines/titanic/game/placeholder/bar_shelf_vis_centre.cpp @@ -27,13 +27,13 @@ namespace Titanic { void CBarShelfVisCentre::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); file->writeNumberLine(_value, indent); - CPlaceHolder::save(file, indent); + CPlaceHolderItem::save(file, indent); } void CBarShelfVisCentre::load(SimpleFile *file) { file->readNumber(); _value = file->readNumber(); - CPlaceHolder::load(file); + CPlaceHolderItem::load(file); } } // End of namespace Titanic diff --git a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h index a2d39c3ea7..a5acff6a47 100644 --- a/engines/titanic/game/placeholder/bar_shelf_vis_centre.h +++ b/engines/titanic/game/placeholder/bar_shelf_vis_centre.h @@ -23,16 +23,16 @@ #ifndef TITANIC_BAR_SHELF_VIS_CENTRE_H #define TITANIC_BAR_SHELF_VIS_CENTRE_H -#include "titanic/game/placeholder/place_holder.h" +#include "titanic/game/placeholder/place_holder_item.h" namespace Titanic { -class CBarShelfVisCentre : public CPlaceHolder { +class CBarShelfVisCentre : public CPlaceHolderItem { private: int _value; public: CLASSDEF - CBarShelfVisCentre() : CPlaceHolder(), _value(0) {} + CBarShelfVisCentre() : CPlaceHolderItem(), _value(0) {} /** * Save the data for the class to file diff --git a/engines/titanic/game/placeholder/lemon_on_bar.cpp b/engines/titanic/game/placeholder/lemon_on_bar.cpp index 336933a8df..d51f4b8758 100644 --- a/engines/titanic/game/placeholder/lemon_on_bar.cpp +++ b/engines/titanic/game/placeholder/lemon_on_bar.cpp @@ -27,13 +27,13 @@ namespace Titanic { void CLemonOnBar::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); file->writePoint(_pos1, indent); - CPlaceHolder::save(file, indent); + CPlaceHolderItem::save(file, indent); } void CLemonOnBar::load(SimpleFile *file) { file->readNumber(); _pos1 = file->readPoint(); - CPlaceHolder::load(file); + CPlaceHolderItem::load(file); } } // End of namespace Titanic diff --git a/engines/titanic/game/placeholder/lemon_on_bar.h b/engines/titanic/game/placeholder/lemon_on_bar.h index 18559b0350..d1654bfeb9 100644 --- a/engines/titanic/game/placeholder/lemon_on_bar.h +++ b/engines/titanic/game/placeholder/lemon_on_bar.h @@ -23,11 +23,11 @@ #ifndef TITANIC_LEMON_ON_BAR_H #define TITANIC_LEMON_ON_BAR_H -#include "titanic/game/placeholder/place_holder.h" +#include "titanic/game/placeholder/place_holder_item.h" namespace Titanic { -class CLemonOnBar : public CPlaceHolder { +class CLemonOnBar : public CPlaceHolderItem { private: Point _pos1; public: diff --git a/engines/titanic/game/placeholder/place_holder.cpp b/engines/titanic/game/placeholder/place_holder.cpp deleted file mode 100644 index d96f551ee4..0000000000 --- a/engines/titanic/game/placeholder/place_holder.cpp +++ /dev/null @@ -1,37 +0,0 @@ -/* 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/game/placeholder/place_holder.h" - -namespace Titanic { - -void CPlaceHolder::save(SimpleFile *file, int indent) const { - file->writeNumberLine(1, indent); - CGameObject::save(file, indent); -} - -void CPlaceHolder::load(SimpleFile *file) { - file->readNumber(); - CGameObject::load(file); -} - -} // End of namespace Titanic diff --git a/engines/titanic/game/placeholder/place_holder.h b/engines/titanic/game/placeholder/place_holder.h deleted file mode 100644 index 4d01cd6c39..0000000000 --- a/engines/titanic/game/placeholder/place_holder.h +++ /dev/null @@ -1,47 +0,0 @@ -/* 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_PLACE_HOLDER_H -#define TITANIC_PLACE_HOLDER_H - -#include "titanic/core/game_object.h" - -namespace Titanic { - -class CPlaceHolder : public CGameObject { -public: - CLASSDEF - - /** - * 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_PLACE_HOLDER_H */ diff --git a/engines/titanic/game/placeholder/place_holder_item.cpp b/engines/titanic/game/placeholder/place_holder_item.cpp new file mode 100644 index 0000000000..a3c26c8b7f --- /dev/null +++ b/engines/titanic/game/placeholder/place_holder_item.cpp @@ -0,0 +1,37 @@ +/* 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/game/placeholder/place_holder_item.h" + +namespace Titanic { + +void CPlaceHolderItem::save(SimpleFile *file, int indent) const { + file->writeNumberLine(1, indent); + CGameObject::save(file, indent); +} + +void CPlaceHolderItem::load(SimpleFile *file) { + file->readNumber(); + CGameObject::load(file); +} + +} // End of namespace Titanic diff --git a/engines/titanic/game/placeholder/place_holder_item.h b/engines/titanic/game/placeholder/place_holder_item.h new file mode 100644 index 0000000000..c665e0f626 --- /dev/null +++ b/engines/titanic/game/placeholder/place_holder_item.h @@ -0,0 +1,47 @@ +/* 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_PLACE_HOLDER_H +#define TITANIC_PLACE_HOLDER_H + +#include "titanic/core/game_object.h" + +namespace Titanic { + +class CPlaceHolderItem : public CGameObject { +public: + CLASSDEF + + /** + * 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_PLACE_HOLDER_H */ diff --git a/engines/titanic/game/placeholder/tv_on_bar.cpp b/engines/titanic/game/placeholder/tv_on_bar.cpp index 5b22069a93..3b97658a86 100644 --- a/engines/titanic/game/placeholder/tv_on_bar.cpp +++ b/engines/titanic/game/placeholder/tv_on_bar.cpp @@ -27,13 +27,13 @@ namespace Titanic { void CTVOnBar::save(SimpleFile *file, int indent) const { file->writeNumberLine(1, indent); file->writePoint(_pos1, indent); - CPlaceHolder::save(file, indent); + CPlaceHolderItem::save(file, indent); } void CTVOnBar::load(SimpleFile *file) { file->readNumber(); _pos1 = file->readPoint(); - CPlaceHolder::load(file); + CPlaceHolderItem::load(file); } } // End of namespace Titanic 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