libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

M4: Do not use Common::SubReadStream where ReadStream suffices

Browse Source 
svn-id: r54342
This commit is contained in:
Max Horn 2010-11-18 19:27:01 +00:00
parent 49468fdfff
commit d6592aaba6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/m4/converse.cpp
View File

@ -950,7 +950,7 @@ void Converse::loadConversationMads(const char *convName) {
for (j = 0; j < _convNodes[i]->entryCount; j++) { 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, "*** 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); 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]); readConvEntryActions(entryStream, _convNodes[i]->entries[j]);
delete entryStream; delete entryStream;
debugCN(kDebugConversations, "--------------------\n"); debugCN(kDebugConversations, "--------------------\n");
@ -960,7 +960,7 @@ void Converse::loadConversationMads(const char *convName) {
delete convS; delete convS;
} }
void Converse::readConvEntryActions(Common::SubReadStream *convS, ConvEntry *curEntry) { void Converse::readConvEntryActions(Common::ReadStream *convS, ConvEntry *curEntry) {
uint8 chunk; uint8 chunk;
uint8 type; // 255: normal, 11: conditional uint8 type; // 255: normal, 11: conditional
uint8 hasText1, hasText2; uint8 hasText1, hasText2;

2
engines/m4/converse.h
View File

@ -191,7 +191,7 @@ private:
void loadConversation(const char *convName); void loadConversation(const char *convName);
void loadConversationMads(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); void setEntryInfo(int32 offset, EntryType type, int32 nodeIndex, int32 entryIndex);
}; };