[Scummvm-cvs-logs] SF.net SVN: scummvm:[42125] scummvm/trunk/engines/gob

drmccoy at users.sourceforge.net drmccoy at users.sourceforge.net
Sun Jul 5 13:28:25 CEST 2009


Revision: 42125
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42125&view=rev
Author:   drmccoy
Date:     2009-07-05 11:28:25 +0000 (Sun, 05 Jul 2009)

Log Message:
-----------
Removing the now empty Game_Fascination class

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game.h
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/module.mk

Removed Paths:
-------------
    scummvm/trunk/engines/gob/game_fascin.cpp

Modified: scummvm/trunk/engines/gob/game.h
===================================================================
--- scummvm/trunk/engines/gob/game.h	2009-07-05 11:28:09 UTC (rev 42124)
+++ scummvm/trunk/engines/gob/game.h	2009-07-05 11:28:25 UTC (rev 42125)
@@ -159,12 +159,6 @@
 	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

Deleted: scummvm/trunk/engines/gob/game_fascin.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_fascin.cpp	2009-07-05 11:28:09 UTC (rev 42124)
+++ scummvm/trunk/engines/gob/game_fascin.cpp	2009-07-05 11:28:25 UTC (rev 42125)
@@ -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

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2009-07-05 11:28:09 UTC (rev 42124)
+++ scummvm/trunk/engines/gob/gob.cpp	2009-07-05 11:28:25 UTC (rev 42125)
@@ -353,7 +353,7 @@
 		_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);

Modified: scummvm/trunk/engines/gob/module.mk
===================================================================
--- scummvm/trunk/engines/gob/module.mk	2009-07-05 11:28:09 UTC (rev 42124)
+++ scummvm/trunk/engines/gob/module.mk	2009-07-05 11:28:25 UTC (rev 42125)
@@ -14,7 +14,6 @@
 	game_v1.o \
 	game_v2.o \
 	game_v6.o \
-	game_fascin.o \
 	global.o \
 	gob.o \
 	goblin.o \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list