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

[fingolfin at users.sourceforge.net]

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

Log Message:
-----------
SCI: Add Resource::getNumber method

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:34:55 UTC (rev 49847)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-15 12:35:17 UTC (rev 49848)
@@ -334,10 +334,10 @@
 }
 
 void MacResourceForkResourceSource::loadResource(Resource *res) {
-	Common::SeekableReadStream *stream = _macResMan->getResource(resTypeToMacTag(res->getType()), res->_id.getNumber());
+	Common::SeekableReadStream *stream = _macResMan->getResource(resTypeToMacTag(res->getType()), res->getNumber());
 
 	if (!stream)
-		error("Could not get Mac resource fork resource: %d %d", res->getType(), res->_id.getNumber());
+		error("Could not get Mac resource fork resource: %d %d", res->getType(), res->getNumber());
 
 	int error = res->decompress(stream);
 	if (error) {
@@ -799,7 +799,7 @@
 
 	ResourceMap::iterator itr = _resMap.begin();
 	while (itr != _resMap.end()) {
-		if ((itr->_value->getType() == type) && ((mapNumber == -1) || (itr->_value->_id.getNumber() == mapNumber)))
+		if ((itr->_value->getType() == type) && ((mapNumber == -1) || (itr->_value->getNumber() == mapNumber)))
 			resources->push_back(itr->_value->_id);
 		++itr;
 	}
@@ -1551,7 +1551,7 @@
 		// Doesn't store this data in the resource. Fortunately,
 		// we already have this data.
 		type = getType();
-		number = _id.getNumber();
+		number = getNumber();
 		szPacked = file->size();
 		szUnpacked = file->size();
 		wCompression = 0;

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-06-15 12:34:55 UTC (rev 49847)
+++ scummvm/trunk/engines/sci/resource.h	2010-06-15 12:35:17 UTC (rev 49848)
@@ -198,6 +198,7 @@
 	void unalloc();
 
 	inline ResourceType getType() const { return _id.getType(); }
+	inline uint16 getNumber() const { return _id.getNumber(); }
 
 	/**
 	 * Write the resource to the specified stream.


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