diff options
author | Paul Gilbert | 2016-07-31 17:51:22 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-31 17:51:22 -0400 |
commit | 093acc60dfd00c8a8ed703d98857c2880e3c8567 (patch) | |
tree | f5f92b8bb77f6a87c563b04acbc6945b4a48d0c9 /engines | |
parent | 1e806a885b089034835d2481ad9ea71ef580c04e (diff) | |
download | scummvm-rg350-093acc60dfd00c8a8ed703d98857c2880e3c8567.tar.gz scummvm-rg350-093acc60dfd00c8a8ed703d98857c2880e3c8567.tar.bz2 scummvm-rg350-093acc60dfd00c8a8ed703d98857c2880e3c8567.zip |
TITANIC: Remove unneeded CTestArray class that was breaking compilation
Diffstat (limited to 'engines')
m--------- | engines/aesop | 0 | ||||
-rw-r--r-- | engines/titanic/carry/test_carry.cpp | 43 | ||||
-rw-r--r-- | engines/titanic/carry/test_carry.h | 50 | ||||
-rw-r--r-- | engines/titanic/module.mk | 1 |
4 files changed, 0 insertions, 94 deletions
diff --git a/engines/aesop b/engines/aesop new file mode 160000 +Subproject fd57cbf0f0ec4899b038ef667bdacee06278726 diff --git a/engines/titanic/carry/test_carry.cpp b/engines/titanic/carry/test_carry.cpp deleted file mode 100644 index 0e86c51d0a..0000000000 --- a/engines/titanic/carry/test_carry.cpp +++ /dev/null @@ -1,43 +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/carry/test_carry.h" - -namespace Titanic { - -void CTestArray::save(SimpleFile *file, int indent) { - file->writeNumberLine(1, indent); - file->writeNumberLine(_value1, indent); - file->writeNumberLine(_value2, indent); - - CGameObject::save(file, indent); -} - -void CTestArray::load(SimpleFile *file) { - file->readNumber(); - _value1 = file->readNumber(); - _value2 = file->readNumber(); - - CGameObject::load(file); -} - -} // End of namespace Titanic diff --git a/engines/titanic/carry/test_carry.h b/engines/titanic/carry/test_carry.h deleted file mode 100644 index 75e8bb9bf0..0000000000 --- a/engines/titanic/carry/test_carry.h +++ /dev/null @@ -1,50 +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_TEST_CARRY_H -#define TITANIC_TEST_CARRY_H - -#include "titanic/core/game_object.h" - -namespace Titanic { - -class CTestArray : public CGameObject { -public: - int _value1, _value2; -public: - CLASSDEF; - CTestArray() : CGameObject(), _value1(0), _value2(0) {} - - /** - * Save the data for the class to file - */ - virtual void save(SimpleFile *file, int indent); - - /** - * Load the data for the class from file - */ - virtual void load(SimpleFile *file); -}; - -} // End of namespace Titanic - -#endif /* TITANIC_TEST_CARRY_H */ diff --git a/engines/titanic/module.mk b/engines/titanic/module.mk index 1107fddaf5..e087144269 100644 --- a/engines/titanic/module.mk +++ b/engines/titanic/module.mk @@ -51,7 +51,6 @@ MODULE_OBJS := \ carry/plug_in.o \ carry/speech_centre.o \ carry/sweets.o \ - carry/test_carry.o \ carry/vision_centre.o \ core/background.o \ core/click_responder.o \ |