From c9b682243821a6310c6299cb2950d60a16a278ae Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 20 Jan 2008 03:42:42 +0000 Subject: Fixed shadowing warning that I missed svn-id: r30584 --- engines/lure/res_struct.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp index 1123712811..ece6e40372 100644 --- a/engines/lure/res_struct.cpp +++ b/engines/lure/res_struct.cpp @@ -698,10 +698,10 @@ void TalkDataList::saveToStream(WriteStream *stream) { TalkDataList::iterator i; for (i = begin(); i != end(); ++i) { TalkData *rec = *i; - TalkEntryList::iterator i; + TalkEntryList::iterator i2; - for (i = rec->entries.begin(); i != rec->entries.end(); ++i) { - TalkEntryData *entry = *i; + for (i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) { + TalkEntryData *entry = *i2; stream->writeUint16LE(entry->descId); } } @@ -711,10 +711,10 @@ void TalkDataList::loadFromStream(ReadStream *stream) { TalkDataList::iterator i; for (i = begin(); i != end(); ++i) { TalkData *rec = *i; - TalkEntryList::iterator i; + TalkEntryList::iterator i2; - for (i = rec->entries.begin(); i != rec->entries.end(); ++i) { - TalkEntryData *entry = *i; + for (i2 = rec->entries.begin(); i2 != rec->entries.end(); ++i2) { + TalkEntryData *entry = *i2; entry->descId = stream->readUint16LE(); } } -- cgit v1.2.3