aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2008-01-20 03:42:42 +0000
committerPaul Gilbert2008-01-20 03:42:42 +0000
commitc9b682243821a6310c6299cb2950d60a16a278ae (patch)
tree89bc85f46dae7918e9e61981f09fccbd92075883
parent99e2c7c1d65251a188b986685bd7986dda82edb9 (diff)
downloadscummvm-rg350-c9b682243821a6310c6299cb2950d60a16a278ae.tar.gz
scummvm-rg350-c9b682243821a6310c6299cb2950d60a16a278ae.tar.bz2
scummvm-rg350-c9b682243821a6310c6299cb2950d60a16a278ae.zip
Fixed shadowing warning that I missed
svn-id: r30584
-rw-r--r--engines/lure/res_struct.cpp12
1 files 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();
}
}