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

[fingolfin at users.sourceforge.net]

Revision: 49840
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49840&view=rev
Author:   fingolfin
Date:     2010-06-15 12:21:29 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
SCI: Add ResourceManager::getVolVersion()

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-15 12:21:26 UTC (rev 49839)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:21:29 UTC (rev 49840)
@@ -1525,7 +1525,7 @@
 	ResourceType type;
 
 	ResourceManager *resMan = g_sci->getResMan();
-	switch (resMan->_volVersion) {
+	switch (resMan->getVolVersion()) {
 	case kResVersionSci0Sci1Early:
 	case kResVersionSci1Middle:
 		w = file->readUint16LE();

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-06-15 12:21:26 UTC (rev 49839)
+++ scummvm/trunk/engines/sci/resource.h	2010-06-15 12:21:29 UTC (rev 49840)
@@ -228,7 +228,6 @@
 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 @@
 	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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.