SCI: Renamed resource_source_t -> ResourceSource; some cleanup

svn-id: r38593

3 files changed, 74 insertions, 23 deletions

diff --git a/engines/sci/scicore/resource.cpp b/engines/sci/scicore/resource.cpp
index 69576159c4..aa89d4653c 100644
--- a/engines/sci/scicore/resource.cpp
+++ b/engines/sci/scicore/resource.cpp
@@ -137,7 +137,7 @@ int resourcecmp(const void *first, const void *second) {
 /*-----------------------------*/
 
 void
-_scir_add_altsource(resource_t *res, resource_source_t *source, unsigned int file_offset) {
+_scir_add_altsource(resource_t *res, ResourceSource *source, unsigned int file_offset) {
 	resource_altsource_t *rsrc = (resource_altsource_t*)sci_malloc(sizeof(resource_altsource_t));
 
 	rsrc->next = res->alt_sources;
@@ -159,10 +159,10 @@ _scir_find_resource_unsorted(resource_t *res, int res_nr, int type, int number)
 /** Resource source list management **/
 /*-----------------------------------*/
 
-resource_source_t *
+ResourceSource *
 scir_add_external_map(ResourceManager *mgr, char *file_name) {
-	resource_source_t *newsrc = (resource_source_t *)
-	                            malloc(sizeof(resource_source_t));
+	ResourceSource *newsrc = (ResourceSource *)
+	                            malloc(sizeof(ResourceSource));
 
 	/* Add the new source to the SLL of sources */
 	newsrc->next = mgr->sources;
@@ -176,11 +176,11 @@ scir_add_external_map(ResourceManager *mgr, char *file_name) {
 	return newsrc;
 }
 
-resource_source_t *
-scir_add_volume(ResourceManager *mgr, resource_source_t *map, char *filename,
+ResourceSource *
+scir_add_volume(ResourceManager *mgr, ResourceSource *map, char *filename,
                 int number, int extended_addressing) {
-	resource_source_t *newsrc = (resource_source_t *)
-	                            malloc(sizeof(resource_source_t));
+	ResourceSource *newsrc = (ResourceSource *)
+	                            malloc(sizeof(ResourceSource));
 
 	/* Add the new source to the SLL of sources */
 	newsrc->next = mgr->sources;
@@ -194,10 +194,10 @@ scir_add_volume(ResourceManager *mgr, resource_source_t *map, char *filename,
 	return 0;
 }
 
-resource_source_t *
+ResourceSource *
 scir_add_patch_dir(ResourceManager *mgr, int type, char *dirname) {
-	resource_source_t *newsrc = (resource_source_t *)
-	                            malloc(sizeof(resource_source_t));
+	ResourceSource *newsrc = (ResourceSource *)
+	                            malloc(sizeof(ResourceSource));
 
 	/* Add the new source to the SLL of sources */
 	newsrc->next = mgr->sources;
@@ -209,9 +209,9 @@ scir_add_patch_dir(ResourceManager *mgr, int type, char *dirname) {
 	return 0;
 }
 
-resource_source_t *
-scir_get_volume(ResourceManager *mgr, resource_source_t *map, int volume_nr) {
-	resource_source_t *seeker = mgr->sources;
+ResourceSource *
+scir_get_volume(ResourceManager *mgr, ResourceSource *map, int volume_nr) {
+	ResourceSource *seeker = mgr->sources;
 
 	while (seeker) {
 		if (seeker->source_type == RESSOURCE_TYPE_VOLUME &&
@@ -432,7 +432,7 @@ scir_add_appropriate_sources(ResourceManager *mgr,
 	//char path_separator;
 	sci_dir_t dirent;
 	char *name;
-	resource_source_t *map;
+	ResourceSource *map;
 	int fd;
 	char fullname[MAXPATHLEN];
 
@@ -469,7 +469,7 @@ scir_add_appropriate_sources(ResourceManager *mgr,
 }
 
 static int
-_scir_scan_new_sources(ResourceManager *mgr, int *detected_version, resource_source_t *source) {
+_scir_scan_new_sources(ResourceManager *mgr, int *detected_version, ResourceSource *source) {
 	int preset_version = mgr->sci_version;
 	int resource_error = 0;
 	int dummy = mgr->sci_version;
@@ -569,7 +569,7 @@ scir_scan_new_sources(ResourceManager *mgr, int *detected_version) {
 }
 
 static void
-_scir_free_resource_sources(resource_source_t *rss) {
+_scir_free_resource_sources(ResourceSource *rss) {
 	if (rss) {
 		_scir_free_resource_sources(rss->next);
 		free(rss);
diff --git a/engines/sci/scicore/resource_map.cpp b/engines/sci/scicore/resource_map.cpp
index 3af9b286f5..39bf42d020 100644
--- a/engines/sci/scicore/resource_map.cpp
+++ b/engines/sci/scicore/resource_map.cpp
@@ -36,6 +36,57 @@
 #define SCI1_RESMAP_ENTRIES_SIZE 6
 #define SCI11_RESMAP_ENTRIES_SIZE 5
 
+/* Resource type encoding */
+#define SCI0_B1_RESTYPE_MASK  0xf8
+#define SCI0_B1_RESTYPE_SHIFT 3
+#define SCI0_B3_RESFILE_MASK  0xfc
+#define SCI0_B3_RESFILE_SHIFT 2
+#define SCI01V_B3_RESFILE_MASK  0xf0
+#define SCI01V_B3_RESFILE_SHIFT 4
+
+#define SCI0_RESID_GET_TYPE(bytes) \
+    (((bytes)[1] & SCI0_B1_RESTYPE_MASK) >> SCI0_B1_RESTYPE_SHIFT)
+#define SCI0_RESID_GET_NUMBER(bytes) \
+    ((((bytes)[1] & ~SCI0_B1_RESTYPE_MASK) << 8) | ((bytes)[0]))
+
+#define SCI0_RESFILE_GET_FILE(bytes) \
+    (((bytes)[3] & SCI0_B3_RESFILE_MASK) >> SCI0_B3_RESFILE_SHIFT)
+#define SCI0_RESFILE_GET_OFFSET(bytes) \
+    ((((bytes)[3] & ~SCI0_B3_RESFILE_MASK) << 24) \
+      | (((bytes)[2]) << 16) \
+      | (((bytes)[1]) << 8) \
+      | (((bytes)[0]) << 0))
+
+#define SCI01V_RESFILE_GET_FILE(bytes) \
+    (((bytes)[3] & SCI01V_B3_RESFILE_MASK) >> SCI01V_B3_RESFILE_SHIFT)
+#define SCI01V_RESFILE_GET_OFFSET(bytes) \
+    ((((bytes)[3] & ~SCI01V_B3_RESFILE_MASK) << 24) \
+      | (((bytes)[2]) << 16) \
+      | (((bytes)[1]) << 8) \
+      | (((bytes)[0]) << 0))
+
+#define SCI1_B5_RESFILE_MASK 0xf0
+#define SCI1_B5_RESFILE_SHIFT 4
+
+#define SCI1_RESFILE_GET_FILE(bytes) \
+  (((bytes)[5] & SCI1_B5_RESFILE_MASK) >> SCI1_B5_RESFILE_SHIFT)
+
+#define SCI1_RESFILE_GET_OFFSET(bytes) \
+    ((((bytes)[5] & ~SCI1_B5_RESFILE_MASK) << 24) \
+      | (((bytes)[4]) << 16) \
+      | (((bytes)[3]) << 8) \
+      | (((bytes)[2]) << 0))
+
+#define SCI1_RESFILE_GET_NUMBER(bytes) \
+      ((((bytes)[1]) << 8) \
+      | (((bytes)[0]) << 0))
+
+#define SCI11_RESFILE_GET_OFFSET(bytes) \
+    ((((bytes)[4]) << 17) \
+      | (((bytes)[3]) << 9) \
+      | (((bytes)[2]) << 1))
+
+
 static int
 detect_odd_sci01(int fh) {
 	byte buf[6];
@@ -73,7 +124,7 @@ detect_odd_sci01(int fh) {
 }
 
 static int
-sci_res_read_entry(ResourceManager *mgr, resource_source_t *map,
+sci_res_read_entry(ResourceManager *mgr, ResourceSource *map,
                    byte *buf, resource_t *res, int sci_version) {
 	res->id = buf[0] | (buf[1] << 8);
 	res->type = SCI0_RESID_GET_TYPE(buf);
@@ -149,7 +200,7 @@ int sci1_parse_header(int fd, int *types, int *lastrt) {
 
 
 int
-sci0_read_resource_map(ResourceManager *mgr, resource_source_t *map, resource_t **resource_p, int *resource_nr_p, int *sci_version) {
+sci0_read_resource_map(ResourceManager *mgr, ResourceSource *map, resource_t **resource_p, int *resource_nr_p, int *sci_version) {
 	int fsize;
 	int fd;
 	resource_t *resources;
@@ -334,7 +385,7 @@ static int sci10_or_11(int *types) {
 }
 
 int
-sci1_read_resource_map(ResourceManager *mgr, resource_source_t *map, resource_source_t *vol,
+sci1_read_resource_map(ResourceManager *mgr, ResourceSource *map, ResourceSource *vol,
                        resource_t **resource_p, int *resource_nr_p, int *sci_version) {
 	int fsize;
 	int fd;
diff --git a/engines/sci/scicore/resource_patch.cpp b/engines/sci/scicore/resource_patch.cpp
index f896167c45..a9e472468f 100644
--- a/engines/sci/scicore/resource_patch.cpp
+++ b/engines/sci/scicore/resource_patch.cpp
@@ -39,7 +39,7 @@ sci1_sprintf_patch_file_name(char *string, resource_t *res) {
 
 /* version-agnostic patch application */
 static void
-process_patch(resource_source_t *source,
+process_patch(ResourceSource *source,
               char *entry, int restype, int resnumber, resource_t **resource_p, int *resource_nr_p) {
 	int fsize;
 	char filename[MAXPATHLEN];
@@ -119,7 +119,7 @@ process_patch(resource_source_t *source,
 
 
 int
-sci0_read_resource_patches(resource_source_t *source, resource_t **resource_p, int *resource_nr_p) {
+sci0_read_resource_patches(ResourceSource *source, resource_t **resource_p, int *resource_nr_p) {
 	sci_dir_t dir;
 	char *entry;
 	char *caller_cwd = sci_getcwd();
@@ -166,7 +166,7 @@ sci0_read_resource_patches(resource_source_t *source, resource_t **resource_p, i
 }
 
 int
-sci1_read_resource_patches(resource_source_t *source, resource_t **resource_p, int *resource_nr_p) {
+sci1_read_resource_patches(ResourceSource *source, resource_t **resource_p, int *resource_nr_p) {
 	sci_dir_t dir;
 	char *entry;
 	char *caller_cwd = sci_getcwd();