[Scummvm-cvs-logs] SF.net SVN: scummvm:[54342] scummvm/trunk/engines/m4

[fingolfin at users.sourceforge.net]

Revision: 54342
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54342&view=rev
Author:   fingolfin
Date:     2010-11-18 19:27:01 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
M4: Do not use Common::SubReadStream where ReadStream suffices

Modified Paths:
--------------
    scummvm/trunk/engines/m4/converse.cpp
    scummvm/trunk/engines/m4/converse.h

Modified: scummvm/trunk/engines/m4/converse.cpp
===================================================================
--- scummvm/trunk/engines/m4/converse.cpp	2010-11-18 19:20:30 UTC (rev 54341)
+++ scummvm/trunk/engines/m4/converse.cpp	2010-11-18 19:27:01 UTC (rev 54342)
@@ -950,7 +950,7 @@
 		for (j = 0; j < _convNodes[i]->entryCount; j++) {
 			debugCN(kDebugConversations, "*** Node %i entry %i data size %i\n", i, j, _convNodes[i]->entries[j]->size);
 			debugCN(kDebugConversations, "Entry ID %i, text %s\n", _convNodes[i]->entries[j]->id, _convNodes[i]->entries[j]->text);
-			Common::SubReadStream *entryStream = new Common::SubReadStream(convS, _convNodes[i]->entries[j]->size);
+			Common::ReadStream *entryStream = new Common::SubReadStream(convS, _convNodes[i]->entries[j]->size);
 			readConvEntryActions(entryStream, _convNodes[i]->entries[j]);
 			delete entryStream;
 			debugCN(kDebugConversations, "--------------------\n");
@@ -960,7 +960,7 @@
 	delete convS;
 }
 
-void Converse::readConvEntryActions(Common::SubReadStream *convS, ConvEntry *curEntry) {
+void Converse::readConvEntryActions(Common::ReadStream *convS, ConvEntry *curEntry) {
 	uint8 chunk;
 	uint8 type;	// 255: normal, 11: conditional
 	uint8 hasText1, hasText2;

Modified: scummvm/trunk/engines/m4/converse.h
===================================================================
--- scummvm/trunk/engines/m4/converse.h	2010-11-18 19:20:30 UTC (rev 54341)
+++ scummvm/trunk/engines/m4/converse.h	2010-11-18 19:27:01 UTC (rev 54342)
@@ -191,7 +191,7 @@
 
 	void loadConversation(const char *convName);
 	void loadConversationMads(const char *convName);
-	void readConvEntryActions(Common::SubReadStream *convS, ConvEntry *curEntry);
+	void readConvEntryActions(Common::ReadStream *convS, ConvEntry *curEntry);
 	void setEntryInfo(int32 offset, EntryType type, int32 nodeIndex, int32 entryIndex);
 };
 


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