From ebcb9b0ff01b8daf71e426978434506673d11609 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 23 Nov 2009 23:53:25 +0000 Subject: GROOVIE: Reduce header interdependency svn-id: r46116 --- engines/groovie/detection.cpp | 1 + engines/groovie/detection.h | 43 +++++++++++++++++++++++++++++++++++++++++++ engines/groovie/groovie.cpp | 1 + engines/groovie/groovie.h | 8 +------- 4 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 engines/groovie/detection.h (limited to 'engines/groovie') diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp index aed5ab56f8..7f520dbc6a 100644 --- a/engines/groovie/detection.cpp +++ b/engines/groovie/detection.cpp @@ -26,6 +26,7 @@ #include "common/savefile.h" #include "groovie/groovie.h" +#include "groovie/detection.h" #include "groovie/saveload.h" namespace Groovie { diff --git a/engines/groovie/detection.h b/engines/groovie/detection.h new file mode 100644 index 0000000000..2304377a11 --- /dev/null +++ b/engines/groovie/detection.h @@ -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 diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp index d2a95cf595..5b42df143a 100644 --- a/engines/groovie/groovie.cpp +++ b/engines/groovie/groovie.cpp @@ -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" diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h index fa850b5019..7f8a3b8a22 100644 --- a/engines/groovie/groovie.h +++ b/engines/groovie/groovie.h @@ -26,7 +26,6 @@ #ifndef GROOVIE_H #define GROOVIE_H -#include "engines/advancedDetector.h" #include "engines/engine.h" #include "graphics/surface.h" @@ -56,12 +55,7 @@ enum DebugLevels { // the current limitation is 32 debug levels (1 << 31 is the last one) }; -struct GroovieGameDescription { - ADGameDescription desc; - - EngineVersion version; // Version of the engine - int indexEntry; // The index of the entry in disk.1 for V2 games -}; +struct GroovieGameDescription; class GroovieEngine : public Engine { public: -- cgit v1.2.3