[Scummvm-cvs-logs] scummvm master -> 18c648c9374e951f308ce930228fddbbdbc21096

[eriktorbjorn]

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

Summary:
91610df204 TSAGE: Silence GCC signed/unsigned warning
18c648c937 TSAGE: Silence GCC warning about variable being shadowed


Commit: 91610df204e8d1a823d559d09bd4895c8cc71438
    https://github.com/scummvm/scummvm/commit/91610df204e8d1a823d559d09bd4895c8cc71438
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-08-25T13:54:47-07:00

Commit Message:
TSAGE: Silence GCC signed/unsigned warning

Changed paths:
    engines/tsage/user_interface.cpp



diff --git a/engines/tsage/user_interface.cpp b/engines/tsage/user_interface.cpp
index 43072c8..09cc2fd 100644
--- a/engines/tsage/user_interface.cpp
+++ b/engines/tsage/user_interface.cpp
@@ -486,7 +486,7 @@ void UIElements::updateInventory(int objectNumber) {
 	// Handle changing the page, if necessary, to ensure an optionally supplied
 	// object number will be on-screen
 	if (objectNumber != 0) {
-		for (int idx = 0; idx < _itemList.size(); ++idx) {
+		for (uint idx = 0; idx < _itemList.size(); ++idx) {
 			if (_itemList[idx] == objectNumber) {
 				_slotStart = idx / 4;
 				break;


Commit: 18c648c9374e951f308ce930228fddbbdbc21096
    https://github.com/scummvm/scummvm/commit/18c648c9374e951f308ce930228fddbbdbc21096
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-08-25T13:55:42-07:00

Commit Message:
TSAGE: Silence GCC warning about variable being shadowed

Changed paths:
    engines/tsage/globals.cpp



diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp
index e3aaeb4..71ea160 100644
--- a/engines/tsage/globals.cpp
+++ b/engines/tsage/globals.cpp
@@ -574,7 +574,7 @@ void Ringworld2Globals::synchronize(Serializer &s) {
 	s.syncAsSint16LE(_insetUp);
 	s.syncAsByte(_frameEdgeColor);
 
-	for (int i = 0; i < 508; i += 4)
+	for (i = 0; i < 508; i += 4)
 		s.syncAsByte(_scene1550JunkLocations[i + 2]);
 }