[Scummvm-cvs-logs] SF.net SVN: scummvm:[49807] scummvm/trunk/engines/sci

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Tue Jun 15 14:08:40 CEST 2010


Revision: 49807
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49807&view=rev
Author:   fingolfin
Date:     2010-06-15 12:08:40 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
SCI: Move ResourceSource to new header resource_intern.h

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/resource.h
    scummvm/trunk/engines/sci/resource_audio.cpp

Added Paths:
-----------
    scummvm/trunk/engines/sci/resource_intern.h

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:01:49 UTC (rev 49806)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:08:40 UTC (rev 49807)
@@ -28,6 +28,7 @@
 #include "common/file.h"
 
 #include "sci/resource.h"
+#include "sci/resource_intern.h"
 #include "sci/util.h"
 
 namespace Sci {

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-06-15 12:01:49 UTC (rev 49806)
+++ scummvm/trunk/engines/sci/resource.h	2010-06-15 12:08:40 UTC (rev 49807)
@@ -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,28 +121,8 @@
 
 
 class ResourceManager;
+struct ResourceSource;
 
-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;
-	}
-};
-
 class ResourceId {
 public:
 	ResourceType type;
@@ -538,4 +517,4 @@
 
 } // End of namespace Sci
 
-#endif // SCI_SCICORE_RESOURCE_H
+#endif // SCI_RESOURCE_H

Modified: scummvm/trunk/engines/sci/resource_audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource_audio.cpp	2010-06-15 12:01:49 UTC (rev 49806)
+++ scummvm/trunk/engines/sci/resource_audio.cpp	2010-06-15 12:08:40 UTC (rev 49807)
@@ -28,6 +28,7 @@
 #include "common/file.h"
 
 #include "sci/resource.h"
+#include "sci/resource_intern.h"
 #include "sci/util.h"
 
 namespace Sci {

Added: scummvm/trunk/engines/sci/resource_intern.h
===================================================================
--- scummvm/trunk/engines/sci/resource_intern.h	                        (rev 0)
+++ scummvm/trunk/engines/sci/resource_intern.h	2010-06-15 12:08:40 UTC (rev 49807)
@@ -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


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


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