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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sun Jun 13 09:17:45 CEST 2010


Revision: 49622
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49622&view=rev
Author:   thebluegr
Date:     2010-06-13 07:17:44 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
Added a default constructor for the ResourceSource struct

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-13 06:56:13 UTC (rev 49621)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-13 07:17:44 UTC (rev 49622)
@@ -174,9 +174,6 @@
 
 	newsrc->source_type = kSourceExtMap;
 	newsrc->location_name = file_name;
-	newsrc->resourceFile = 0;
-	newsrc->scanned = false;
-	newsrc->associated_map = NULL;
 	newsrc->volume_number = volume_nr;
 
 	_sources.push_back(newsrc);
@@ -189,8 +186,6 @@
 	newsrc->source_type = kSourceExtMap;
 	newsrc->location_name = mapFile->getName();
 	newsrc->resourceFile = mapFile;
-	newsrc->scanned = false;
-	newsrc->associated_map = NULL;
 	newsrc->volume_number = volume_nr;
 
 	_sources.push_back(newsrc);
@@ -201,13 +196,9 @@
 	ResourceSource *newsrc = new ResourceSource();
 
 	newsrc->source_type = type;
-	newsrc->scanned = false;
 	newsrc->location_name = filename;
-	newsrc->resourceFile = 0;
 	newsrc->volume_number = number;
 	newsrc->associated_map = map;
-	newsrc->audioCompressionType = 0;
-	newsrc->audioCompressionOffsetMapping = NULL;
 	if (type == kSourceAudioVolume)
 		checkIfAudioVolumeIsCompressed(newsrc);
 
@@ -219,13 +210,10 @@
 	ResourceSource *newsrc = new ResourceSource();
 
 	newsrc->source_type = type;
-	newsrc->scanned = false;
 	newsrc->location_name = resFile->getName();
 	newsrc->resourceFile = resFile;
 	newsrc->volume_number = number;
 	newsrc->associated_map = map;
-	newsrc->audioCompressionType = 0;
-	newsrc->audioCompressionOffsetMapping = NULL;
 	if (type == kSourceAudioVolume)
 		checkIfAudioVolumeIsCompressed(newsrc);
 
@@ -237,8 +225,6 @@
 	ResourceSource *newsrc = new ResourceSource();
 
 	newsrc->source_type = kSourceDirectory;
-	newsrc->resourceFile = 0;
-	newsrc->scanned = false;
 	newsrc->location_name = dirname;
 
 	_sources.push_back(newsrc);
@@ -1229,9 +1215,6 @@
 				psrcPatch = new ResourceSource;
 				psrcPatch->source_type = kSourcePatch;
 				psrcPatch->location_name = name;
-				psrcPatch->resourceFile = 0;
-				psrcPatch->audioCompressionType = 0;
-				psrcPatch->audioCompressionOffsetMapping = NULL;
 				processPatch(psrcPatch, (ResourceType)i, resourceNr, resource36.tuple);
 			}
 		}
@@ -1282,9 +1265,6 @@
 				psrcPatch = new ResourceSource;
 				psrcPatch->source_type = kSourcePatch;
 				psrcPatch->location_name = name;
-				psrcPatch->resourceFile = 0;
-				psrcPatch->audioCompressionType = 0;
-				psrcPatch->audioCompressionOffsetMapping = NULL;
 				processPatch(psrcPatch, (ResourceType)i, resourceNr);
 			}
 		}

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-06-13 06:56:13 UTC (rev 49621)
+++ scummvm/trunk/engines/sci/resource.h	2010-06-13 07:17:44 UTC (rev 49622)
@@ -133,6 +133,15 @@
 	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 {


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