[Scummvm-cvs-logs] scummvm master -> 1ae67bf2a9abf4f2405a3d16a3b8e2d4164d4c81

dreammaster dreammaster at scummvm.org
Tue Nov 17 04:47:16 CET 2015


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
1ae67bf2a9 LURE: Fix compiler warning


Commit: 1ae67bf2a9abf4f2405a3d16a3b8e2d4164d4c81
    https://github.com/scummvm/scummvm/commit/1ae67bf2a9abf4f2405a3d16a3b8e2d4164d4c81
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-11-16T22:46:36-05:00

Commit Message:
LURE: Fix compiler warning

Changed paths:
    engines/lure/res_struct.cpp



diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 73efc3a..ec1a546 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -1218,11 +1218,11 @@ void BarmanLists::loadFromStream(Common::ReadStream *stream) {
 
 void StringList::load(MemoryBlock *data) {
 	// Get the number of entries
-	uint count = READ_LE_UINT16(data->data());
+	uint numEntries = READ_LE_UINT16(data->data());
 
 	// Iterate through loading the strings one at a time
 	const char *p = (const char *)data->data() + sizeof(uint16);
-	for (uint index = 0; index < count; ++index) {
+	for (uint index = 0; index < numEntries; ++index) {
 		_entries.push_back(p);
 		p += strlen(p) + 1;
 	}






More information about the Scummvm-git-logs mailing list