aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/include
diff options
context:
space:
mode:
authorMax Horn2009-02-22 04:22:53 +0000
committerMax Horn2009-02-22 04:22:53 +0000
commitd9a98ddc215cd4244c21673552f31331126abcb9 (patch)
tree4f4708b1c15a1f14e61d82efcf606585cfbc12e9 /engines/sci/include
parenta4968c1cf68293471bc6eca93d68106ce952dec1 (diff)
downloadscummvm-rg350-d9a98ddc215cd4244c21673552f31331126abcb9.tar.gz
scummvm-rg350-d9a98ddc215cd4244c21673552f31331126abcb9.tar.bz2
scummvm-rg350-d9a98ddc215cd4244c21673552f31331126abcb9.zip
SCI: cleanup
svn-id: r38779
Diffstat (limited to 'engines/sci/include')
-rw-r--r--engines/sci/include/sciresource.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/engines/sci/include/sciresource.h b/engines/sci/include/sciresource.h
index 37af0ec695..1bad516e1f 100644
--- a/engines/sci/include/sciresource.h
+++ b/engines/sci/include/sciresource.h
@@ -84,11 +84,14 @@ namespace Sci {
#define SCI_VERSION_1 SCI_VERSION_1_EARLY
-#define RESSOURCE_TYPE_DIRECTORY 0
-#define RESSOURCE_TYPE_VOLUME 2
-#define RESSOURCE_TYPE_EXTERNAL_MAP 3
-#define RESSOURCE_TYPE_INTERNAL_MAP 4
-#define RESSOURCE_TYPE_MASK 127
+enum ResourceType {
+ RESSOURCE_TYPE_DIRECTORY = 0,
+ RESSOURCE_TYPE_VOLUME = 2,
+ RESSOURCE_TYPE_EXTERNAL_MAP = 3,
+ RESSOURCE_TYPE_INTERNAL_MAP = 4,
+ RESSOURCE_TYPE_MASK = 127
+};
+
#define RESSOURCE_ADDRESSING_BASIC 0
#define RESSOURCE_ADDRESSING_EXTENDED 128
#define RESSOURCE_ADDRESSING_MASK 128
@@ -121,7 +124,7 @@ struct resource_index_struct {
typedef struct resource_index_struct resource_index_t;
struct ResourceSource {
- int source_type;
+ ResourceType source_type;
bool scanned;
Common::String location_name; // FIXME: Replace by FSNode ?
Common::String location_dir_name; // FIXME: Get rid of this again, only a temporary HACK!