[Scummvm-cvs-logs] scummvm master -> 77440aadf4055d5cadf86a7be00e6c8ed51a5be7

[eriktorbjorn]

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:
77440aadf4 TSAGE: Silence GCC warnings.


Commit: 77440aadf4055d5cadf86a7be00e6c8ed51a5be7
    https://github.com/scummvm/scummvm/commit/77440aadf4055d5cadf86a7be00e6c8ed51a5be7
Author: eriktorbjorn (eriktorbjorn at users.sourceforge.net)
Date: 2011-06-23T08:29:34-07:00

Commit Message:
TSAGE: Silence GCC warnings.

Changed paths:
    engines/tsage/resources.cpp
    engines/tsage/sound.cpp



diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp
index e6a561f..6d2c6b5 100644
--- a/engines/tsage/resources.cpp
+++ b/engines/tsage/resources.cpp
@@ -243,7 +243,7 @@ byte *TLib::getResource(uint16 id, bool suppressErrors) {
 	if (!table)
 		error("[TLib::getResource] Cannot allocate table buffer");
 
-	for (int i = 0; i < tableSize; ++i) {
+	for (uint i = 0; i < tableSize; ++i) {
 		table[i].vByte = table[i].vWord = 0;
 	}
 	Common::Stack<uint16> tokenList;
diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 6f06186..8bdb2f2 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -359,9 +359,9 @@ void SoundManager::_sfSoundServer() {
 	_sfProcessFading();
 
 	// Poll all sound drivers in case they need it
-	for (Common::List<SoundDriver *>::iterator i = sfManager()._installedDrivers.begin();
-				i != sfManager()._installedDrivers.end(); ++i) {
-		(*i)->poll();
+	for (Common::List<SoundDriver *>::iterator j = sfManager()._installedDrivers.begin();
+				j != sfManager()._installedDrivers.end(); ++j) {
+		(*j)->poll();
 	}
 }