[Scummvm-cvs-logs] SF.net SVN: scummvm:[44015] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 44015
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44015&view=rev
Author:   fingolfin
Date:     2009-09-08 22:03:07 +0000 (Tue, 08 Sep 2009)

Log Message:
-----------
Fixed some (pedantic) warnings

Modified Paths:
--------------
    scummvm/trunk/engines/gob/hotspots.cpp
    scummvm/trunk/engines/gob/sound/adlib.cpp
    scummvm/trunk/engines/groovie/cursor.cpp
    scummvm/trunk/engines/sci/engine/savegame.cpp
    scummvm/trunk/graphics/scaler/thumbnail_intern.cpp

Modified: scummvm/trunk/engines/gob/hotspots.cpp
===================================================================
--- scummvm/trunk/engines/gob/hotspots.cpp	2009-09-08 20:08:29 UTC (rev 44014)
+++ scummvm/trunk/engines/gob/hotspots.cpp	2009-09-08 22:03:07 UTC (rev 44015)
@@ -986,7 +986,8 @@
 			    ((_vm->_global->_useMouse != 0) || (_vm->_game->_forceHandleMouse != 0)))
 				handleMouse = true;
 
-			while (_vm->_global->_pressedKeys[1] != 0);
+			while (_vm->_global->_pressedKeys[1] != 0)
+				;
 			continue;
 
 		default:

Modified: scummvm/trunk/engines/gob/sound/adlib.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/adlib.cpp	2009-09-08 20:08:29 UTC (rev 44014)
+++ scummvm/trunk/engines/gob/sound/adlib.cpp	2009-09-08 22:03:07 UTC (rev 44015)
@@ -624,7 +624,8 @@
 			ctrlByte2 = *(_playPos++);
 			if (ctrlByte1 != 0x7F || ctrlByte2 != 0) {
 				_playPos -= 2;
-				while (*(_playPos++) != 0xF7);
+				while (*(_playPos++) != 0xF7)
+					;
 			} else {
 				tempoMult = *(_playPos++);
 				tempoFrac = *(_playPos++);

Modified: scummvm/trunk/engines/groovie/cursor.cpp
===================================================================
--- scummvm/trunk/engines/groovie/cursor.cpp	2009-09-08 20:08:29 UTC (rev 44014)
+++ scummvm/trunk/engines/groovie/cursor.cpp	2009-09-08 22:03:07 UTC (rev 44015)
@@ -297,7 +297,7 @@
 
 	byte ctrA = 0, ctrB = 0;
 
-	byte alpha, palIdx;
+	byte alpha = 0, palIdx = 0;
 
 	byte r, g, b;
 

Modified: scummvm/trunk/engines/sci/engine/savegame.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/savegame.cpp	2009-09-08 20:08:29 UTC (rev 44014)
+++ scummvm/trunk/engines/sci/engine/savegame.cpp	2009-09-08 22:03:07 UTC (rev 44015)
@@ -203,7 +203,7 @@
 
 			s.skip(4);	// base_value
 			while (true) {
-				uint32 key;
+				uint32 key = 0;
 				s.syncAsSint32LE(key);
 				if (key == INTMAPPER_MAGIC_KEY)
 					break;

Modified: scummvm/trunk/graphics/scaler/thumbnail_intern.cpp
===================================================================
--- scummvm/trunk/graphics/scaler/thumbnail_intern.cpp	2009-09-08 20:08:29 UTC (rev 44014)
+++ scummvm/trunk/graphics/scaler/thumbnail_intern.cpp	2009-09-08 22:03:07 UTC (rev 44015)
@@ -111,7 +111,7 @@
 
 	for (uint y = 0; y < screen->h; ++y) {
 		for (uint x = 0; x < screen->w; ++x) {
-			byte r, g, b;
+			byte r = 0, g = 0, b = 0;
 
 			if (screenFormat.bytesPerPixel == 1) {
 				r = palette[((uint8*)screen->pixels)[y * screen->pitch + x] * 4];


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