aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMax Horn2010-06-15 12:21:29 +0000
committerMax Horn2010-06-15 12:21:29 +0000
commit68eeef8f1aa560954297291887f26bad6591aa15 (patch)
treefcad70bb888df794f4150b45a785c61b8676ec05 /engines
parentdb4533533a4e6676a834a5c036a088cdcb04de5f (diff)
downloadscummvm-rg350-68eeef8f1aa560954297291887f26bad6591aa15.tar.gz
scummvm-rg350-68eeef8f1aa560954297291887f26bad6591aa15.tar.bz2
scummvm-rg350-68eeef8f1aa560954297291887f26bad6591aa15.zip
SCI: Add ResourceManager::getVolVersion()
svn-id: r49840
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/resource.cpp2
-rw-r--r--engines/sci/resource.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index fb601c7f82..80b3108988 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1525,7 +1525,7 @@ int Resource::readResourceInfo(Common::SeekableReadStream *file,
ResourceType type;
ResourceManager *resMan = g_sci->getResMan();
- switch (resMan->_volVersion) {
+ switch (resMan->getVolVersion()) {
case kResVersionSci0Sci1Early:
case kResVersionSci1Middle:
w = file->readUint16LE();
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index 4b391cf6cd..d2dff8f58d 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -228,7 +228,6 @@ enum ResVersion {
class ResourceManager {
// FIXME: These 'friend' declarations are meant to be a temporary hack to
// ease transition to the ResourceSource class system.
- friend class Resource; // For _volVersion
friend class ResourceSource;
friend class DirectoryResourceSource;
friend class PatchResourceSource;
@@ -301,6 +300,7 @@ public:
ViewType getViewType() const { return _viewType; }
const char *getMapVersionDesc() const { return versionDescription(_mapVersion); }
const char *getVolVersionDesc() const { return versionDescription(_volVersion); }
+ ResVersion getVolVersion() const { return _volVersion; }
/**
* Adds the appropriate GM patch from the Sierra MIDI utility as 4.pat, without