aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2009-07-05 11:28:25 +0000
committerSven Hesse2009-07-05 11:28:25 +0000
commitbc4f27c6b6c5a7cdf6ecc088ecf39f8f0546d976 (patch)
treecf17944a39a8aeb7320630d66a147a0397673e70 /engines
parent86f0669c93c7fa3d8887820470e075b20abe1a71 (diff)
downloadscummvm-rg350-bc4f27c6b6c5a7cdf6ecc088ecf39f8f0546d976.tar.gz
scummvm-rg350-bc4f27c6b6c5a7cdf6ecc088ecf39f8f0546d976.tar.bz2
scummvm-rg350-bc4f27c6b6c5a7cdf6ecc088ecf39f8f0546d976.zip
Removing the now empty Game_Fascination class
svn-id: r42125
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/game.h6
-rw-r--r--engines/gob/game_fascin.cpp48
-rw-r--r--engines/gob/gob.cpp2
-rw-r--r--engines/gob/module.mk1
4 files changed, 1 insertions, 56 deletions
diff --git a/engines/gob/game.h b/engines/gob/game.h
index e6a7a4c089..c6c7bd76d9 100644
--- a/engines/gob/game.h
+++ b/engines/gob/game.h
@@ -159,12 +159,6 @@ public:
virtual void prepareStart(void);
};
-class Game_Fascination : public Game_v2 {
-public:
- Game_Fascination(GobEngine *vm);
- virtual ~Game_Fascination() {}
-};
-
} // End of namespace Gob
#endif // GOB_GAME_H
diff --git a/engines/gob/game_fascin.cpp b/engines/gob/game_fascin.cpp
deleted file mode 100644
index 20480f778f..0000000000
--- a/engines/gob/game_fascin.cpp
+++ /dev/null
@@ -1,48 +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.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "common/endian.h"
-#include "common/stream.h"
-
-#include "gob/gob.h"
-#include "gob/game.h"
-#include "gob/global.h"
-#include "gob/util.h"
-#include "gob/dataio.h"
-#include "gob/draw.h"
-#include "gob/goblin.h"
-#include "gob/inter.h"
-#include "gob/mult.h"
-#include "gob/scenery.h"
-#include "gob/video.h"
-#include "gob/videoplayer.h"
-#include "gob/sound/sound.h"
-
-namespace Gob {
-
-Game_Fascination::Game_Fascination(GobEngine *vm) : Game_v2(vm) {
-}
-
-} // End of namespace Gob
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index e534464cce..9e1dfb0738 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -353,7 +353,7 @@ bool GobEngine::initGameParts() {
_inter = new Inter_Fascination(this);
_mult = new Mult_v2(this);
_draw = new Draw_v2(this);
- _game = new Game_Fascination(this);
+ _game = new Game_v2(this);
_map = new Map_v2(this);
_goblin = new Goblin_v2(this);
_scenery = new Scenery_v2(this);
diff --git a/engines/gob/module.mk b/engines/gob/module.mk
index 6c8b735019..33d8f642b4 100644
--- a/engines/gob/module.mk
+++ b/engines/gob/module.mk
@@ -14,7 +14,6 @@ MODULE_OBJS := \
game_v1.o \
game_v2.o \
game_v6.o \
- game_fascin.o \
global.o \
gob.o \
goblin.o \