From d6592aaba6198c21a8ae6eda9f8d6fc46d5b1557 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Thu, 18 Nov 2010 19:27:01 +0000
Subject: M4: Do not use Common::SubReadStream where ReadStream suffices

svn-id: r54342
---
 engines/m4/converse.cpp | 4 ++--
 engines/m4/converse.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/m4')

diff --git a/engines/m4/converse.cpp b/engines/m4/converse.cpp
index 0e10e5e89d..1a0e2e8d3b 100644
--- a/engines/m4/converse.cpp
+++ b/engines/m4/converse.cpp
@@ -950,7 +950,7 @@ void Converse::loadConversationMads(const char *convName) {
 		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 @@ void Converse::loadConversationMads(const char *convName) {
 	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;
diff --git a/engines/m4/converse.h b/engines/m4/converse.h
index 609711b10f..67ecf20424 100644
--- a/engines/m4/converse.h
+++ b/engines/m4/converse.h
@@ -191,7 +191,7 @@ private:
 
 	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);
 };
 
-- 
cgit v1.2.3