[Scummvm-cvs-logs] SF.net SVN: scummvm:[54679] scummvm/trunk/engines/mohawk

mthreepwood at users.sourceforge.net mthreepwood at users.sourceforge.net
Tue Nov 30 16:07:00 CET 2010


Revision: 54679
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54679&view=rev
Author:   mthreepwood
Date:     2010-11-30 15:07:00 +0000 (Tue, 30 Nov 2010)

Log Message:
-----------
MOHAWK: One last getRawData() to getResource() rename

Modified Paths:
--------------
    scummvm/trunk/engines/mohawk/myst.cpp
    scummvm/trunk/engines/mohawk/myst.h

Modified: scummvm/trunk/engines/mohawk/myst.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/myst.cpp	2010-11-30 15:03:31 UTC (rev 54678)
+++ scummvm/trunk/engines/mohawk/myst.cpp	2010-11-30 15:07:00 UTC (rev 54679)
@@ -123,7 +123,7 @@
 }
 
 // Uses cached data objects in preference to disk access
-Common::SeekableReadStream *MohawkEngine_Myst::getRawData(uint32 tag, uint16 id) {
+Common::SeekableReadStream *MohawkEngine_Myst::getResource(uint32 tag, uint16 id) {
 	Common::SeekableReadStream *ret = _cache.search(tag, id);
 
 	if (ret)
@@ -569,7 +569,7 @@
 void MohawkEngine_Myst::loadCard() {
 	debugC(kDebugView, "Loading Card View:");
 
-	Common::SeekableReadStream *viewStream = getRawData(ID_VIEW, _curCard);
+	Common::SeekableReadStream *viewStream = getResource(ID_VIEW, _curCard);
 
 	// Card Flags
 	_view.flags = viewStream->readUint16LE();
@@ -769,7 +769,7 @@
 
 	debugC(kDebugINIT, "Running INIT script");
 
-	Common::SeekableReadStream *initStream = getRawData(ID_INIT, _view.init);
+	Common::SeekableReadStream *initStream = getResource(ID_INIT, _view.init);
 	MystScript script = _scriptParser->readScript(initStream, kMystScriptInit);
 	delete initStream;
 
@@ -784,7 +784,7 @@
 
 	debugC(kDebugEXIT, "Running EXIT script");
 
-	Common::SeekableReadStream *exitStream = getRawData(ID_EXIT, _view.exit);
+	Common::SeekableReadStream *exitStream = getResource(ID_EXIT, _view.exit);
 	MystScript script = _scriptParser->readScript(exitStream, kMystScriptExit);
 	delete exitStream;
 
@@ -805,7 +805,7 @@
 
 	debugC(kDebugHelp, "Loading Help System Data");
 
-	Common::SeekableReadStream *helpStream = getRawData(ID_HELP, id);
+	Common::SeekableReadStream *helpStream = getResource(ID_HELP, id);
 
 	uint16 count = helpStream->readUint16LE();
 	uint16 *u0 = new uint16[count];
@@ -847,7 +847,7 @@
 
 	debugC(kDebugHint, "Loading Cursor Hints:");
 
-	Common::SeekableReadStream *hintStream = getRawData(ID_HINT, _curCard);
+	Common::SeekableReadStream *hintStream = getResource(ID_HINT, _curCard);
 	_cursorHintCount = hintStream->readUint16LE();
 	debugC(kDebugHint, "Cursor Hint Count: %d", _cursorHintCount);
 	_cursorHints = new MystCursorHint[_cursorHintCount];
@@ -997,7 +997,7 @@
 		return;
 	}
 
-	Common::SeekableReadStream *rlstStream = getRawData(ID_RLST, _view.rlst);
+	Common::SeekableReadStream *rlstStream = getResource(ID_RLST, _view.rlst);
 	uint16 resourceCount = rlstStream->readUint16LE();
 	debugC(kDebugResource, "RLST Resource Count: %d", resourceCount);
 

Modified: scummvm/trunk/engines/mohawk/myst.h
===================================================================
--- scummvm/trunk/engines/mohawk/myst.h	2010-11-30 15:03:31 UTC (rev 54678)
+++ scummvm/trunk/engines/mohawk/myst.h	2010-11-30 15:07:00 UTC (rev 54679)
@@ -143,7 +143,7 @@
 	MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription *gamedesc);
 	virtual ~MohawkEngine_Myst();
 
-	Common::SeekableReadStream *getRawData(uint32 tag, uint16 id);
+	Common::SeekableReadStream *getResource(uint32 tag, uint16 id);
 
 	Common::String wrapMovieFilename(const Common::String &movieName, uint16 stack);
 


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




More information about the Scummvm-git-logs mailing list