[Scummvm-cvs-logs] SF.net SVN: scummvm: [30585] scummvm/branches/branch-0-11-0/engines/lure/ res_struct.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sun Jan 20 04:44:54 CET 2008


Revision: 30585
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30585&view=rev
Author:   dreammaster
Date:     2008-01-19 19:44:53 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------
Fixed shadowing warning that I missed

Modified Paths:
--------------
    scummvm/branches/branch-0-11-0/engines/lure/res_struct.cpp

Modified: scummvm/branches/branch-0-11-0/engines/lure/res_struct.cpp
===================================================================
--- scummvm/branches/branch-0-11-0/engines/lure/res_struct.cpp	2008-01-20 03:42:42 UTC (rev 30584)
+++ scummvm/branches/branch-0-11-0/engines/lure/res_struct.cpp	2008-01-20 03:44:53 UTC (rev 30585)
@@ -698,10 +698,10 @@
 	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 @@
 	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();
 		}
 	}


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




More information about the Scummvm-git-logs mailing list