[Scummvm-cvs-logs] SF.net SVN: scummvm:[46116] scummvm/trunk/engines/groovie

[fingolfin at users.sourceforge.net]

Revision: 46116
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46116&view=rev
Author:   fingolfin
Date:     2009-11-23 23:53:25 +0000 (Mon, 23 Nov 2009)

Log Message:
-----------
GROOVIE: Reduce header interdependency

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/detection.cpp
    scummvm/trunk/engines/groovie/groovie.cpp
    scummvm/trunk/engines/groovie/groovie.h

Added Paths:
-----------
    scummvm/trunk/engines/groovie/detection.h

Modified: scummvm/trunk/engines/groovie/detection.cpp
===================================================================
--- scummvm/trunk/engines/groovie/detection.cpp	2009-11-23 23:32:34 UTC (rev 46115)
+++ scummvm/trunk/engines/groovie/detection.cpp	2009-11-23 23:53:25 UTC (rev 46116)
@@ -26,6 +26,7 @@
 #include "common/savefile.h"
 
 #include "groovie/groovie.h"
+#include "groovie/detection.h"
 #include "groovie/saveload.h"
 
 namespace Groovie {

Added: scummvm/trunk/engines/groovie/detection.h
===================================================================
--- scummvm/trunk/engines/groovie/detection.h	                        (rev 0)
+++ scummvm/trunk/engines/groovie/detection.h	2009-11-23 23:53:25 UTC (rev 46116)
@@ -0,0 +1,43 @@
+/* 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$
+ *
+ */
+
+#ifndef GROOVIE_DETECTION_H
+#define GROOVIE_DETECTION_H
+
+#include "engines/advancedDetector.h"
+#include "groovie/script.h"	// for EngineVersion
+
+namespace Groovie {
+
+struct GroovieGameDescription {
+	ADGameDescription desc;
+
+	EngineVersion version; // Version of the engine
+	int indexEntry; // The index of the entry in disk.1 for V2 games
+};
+
+} // End of namespace Groovie
+
+#endif


Property changes on: scummvm/trunk/engines/groovie/detection.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Modified: scummvm/trunk/engines/groovie/groovie.cpp
===================================================================
--- scummvm/trunk/engines/groovie/groovie.cpp	2009-11-23 23:32:34 UTC (rev 46115)
+++ scummvm/trunk/engines/groovie/groovie.cpp	2009-11-23 23:53:25 UTC (rev 46116)
@@ -28,6 +28,7 @@
 #include "sound/mixer.h"
 
 #include "groovie/groovie.h"
+#include "groovie/detection.h"
 #include "groovie/music.h"
 #include "groovie/roq.h"
 #include "groovie/vdx.h"

Modified: scummvm/trunk/engines/groovie/groovie.h
===================================================================
--- scummvm/trunk/engines/groovie/groovie.h	2009-11-23 23:32:34 UTC (rev 46115)
+++ scummvm/trunk/engines/groovie/groovie.h	2009-11-23 23:53:25 UTC (rev 46116)
@@ -26,7 +26,6 @@
 #ifndef GROOVIE_H
 #define GROOVIE_H
 
-#include "engines/advancedDetector.h"
 #include "engines/engine.h"
 #include "graphics/surface.h"
 
@@ -56,13 +55,8 @@
 		// the current limitation is 32 debug levels (1 << 31 is the last one)
 };
 
-struct GroovieGameDescription {
-	ADGameDescription desc;
+struct GroovieGameDescription;
 
-	EngineVersion version; // Version of the engine
-	int indexEntry; // The index of the entry in disk.1 for V2 games
-};
-
 class GroovieEngine : public Engine {
 public:
 	GroovieEngine(OSystem *syst, const GroovieGameDescription *gd);


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