SCI: Move ResourceSource to new header resource_intern.h

svn-id: r49807

4 files changed, 65 insertions, 25 deletions

diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index 1906510d24..d25c3286df 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -28,6 +28,7 @@
 #include "common/file.h"
 
 #include "sci/resource.h"
+#include "sci/resource_intern.h"
 #include "sci/util.h"
 
 namespace Sci {
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 7fbb3ca9a2..e94eaf4d57 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -23,11 +23,10 @@
  *
  */
 
-#ifndef SCI_SCICORE_RESOURCE_H
-#define SCI_SCICORE_RESOURCE_H
+#ifndef SCI_RESOURCE_H
+#define SCI_RESOURCE_H
 
 #include "common/fs.h"
-#include "common/macresman.h"
 #include "common/str.h"
 
 #include "sci/graphics/helpers.h"		// for ViewType
@@ -122,27 +121,7 @@ const char *getResourceTypeName(ResourceType restype);
 
 
 class ResourceManager;
-
-struct ResourceSource {
-	ResSourceType source_type;
-	bool scanned;
-	Common::String location_name;	// FIXME: Replace by FSNode ?
-	const Common::FSNode *resourceFile;
-	int volume_number;
-	ResourceSource *associated_map;
-	uint32 audioCompressionType;
-	int32 *audioCompressionOffsetMapping;
-	Common::MacResManager macResMan;
-	ResourceSource() {
-		source_type = kSourceDirectory;
-		scanned = false;
-		resourceFile = 0;
-		volume_number = 0;
-		associated_map = NULL;
-		audioCompressionType = 0;
-		audioCompressionOffsetMapping = NULL;
-	}
-};
+struct ResourceSource;
 
 class ResourceId {
 public:
@@ -538,4 +517,4 @@ private:
 
 } // End of namespace Sci
 
-#endif // SCI_SCICORE_RESOURCE_H
+#endif // SCI_RESOURCE_H
diff --git a/engines/sci/resource_audio.cpp b/engines/sci/resource_audio.cpp
index 0e60239331..d2f1d53e11 100644
--- a/engines/sci/resource_audio.cpp
+++ b/engines/sci/resource_audio.cpp
@@ -28,6 +28,7 @@
 #include "common/file.h"
 
 #include "sci/resource.h"
+#include "sci/resource_intern.h"
 #include "sci/util.h"
 
 namespace Sci {
diff --git a/engines/sci/resource_intern.h b/engines/sci/resource_intern.h
new file mode 100644
index 0000000000..01f1f45180
--- /dev/null
+++ b/engines/sci/resource_intern.h
@@ -0,0 +1,59 @@
+/* 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 SCI_RESOURCE_INTERN_H
+#define SCI_RESOURCE_INTERN_H
+
+#include "common/macresman.h"
+
+#include "sci/resource.h"
+
+namespace Sci {
+
+struct ResourceSource {
+	ResSourceType source_type;
+	bool scanned;
+	Common::String location_name;	// FIXME: Replace by FSNode ?
+	const Common::FSNode *resourceFile;
+	int volume_number;
+	ResourceSource *associated_map;
+	uint32 audioCompressionType;
+	int32 *audioCompressionOffsetMapping;
+	Common::MacResManager macResMan;
+	ResourceSource() {
+		source_type = kSourceDirectory;
+		scanned = false;
+		resourceFile = 0;
+		volume_number = 0;
+		associated_map = NULL;
+		audioCompressionType = 0;
+		audioCompressionOffsetMapping = NULL;
+	}
+};
+
+
+} // End of namespace Sci
+
+#endif // SCI_RESOURCE_INTERN_H