diff options
author | Max Horn | 2010-06-15 12:08:40 +0000 |
---|---|---|
committer | Max Horn | 2010-06-15 12:08:40 +0000 |
commit | 69bfbdfa0406cd12c2275d481e296cf4f1e3faad (patch) | |
tree | ed2f2772fd0354604bf973ee2b3fa7145d0d3b64 /engines/sci/resource.h | |
parent | 59d0035b033ac4791bfa91245418852a66e4e63a (diff) | |
download | scummvm-rg350-69bfbdfa0406cd12c2275d481e296cf4f1e3faad.tar.gz scummvm-rg350-69bfbdfa0406cd12c2275d481e296cf4f1e3faad.tar.bz2 scummvm-rg350-69bfbdfa0406cd12c2275d481e296cf4f1e3faad.zip |
SCI: Move ResourceSource to new header resource_intern.h
svn-id: r49807
Diffstat (limited to 'engines/sci/resource.h')
-rw-r--r-- | engines/sci/resource.h | 29 |
1 files changed, 4 insertions, 25 deletions
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 |