[Scummvm-cvs-logs] SF.net SVN: scummvm:[43899] scummvm/trunk/engines/gob/map_v2.cpp

[drmccoy at users.sourceforge.net]

Revision: 43899
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43899&view=rev
Author:   drmccoy
Date:     2009-09-01 21:08:42 +0000 (Tue, 01 Sep 2009)

Log Message:
-----------
Fixing warnings and adding a warning should the ID be something yet unknown, just in case

Modified Paths:
--------------
    scummvm/trunk/engines/gob/map_v2.cpp

Modified: scummvm/trunk/engines/gob/map_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/map_v2.cpp	2009-09-01 20:57:29 UTC (rev 43898)
+++ scummvm/trunk/engines/gob/map_v2.cpp	2009-09-01 21:08:42 UTC (rev 43899)
@@ -54,7 +54,6 @@
 	byte *variables;
 	uint32 tmpPos;
 	uint32 passPos;
-	uint16 i;
 
 	var = _vm->_game->_script->readVarIndex();
 	variables = _vm->_inter->_variables->getAddressOff8(var);
@@ -64,15 +63,15 @@
 	if (((uint16) id) >= 65520) {
 		switch ((uint16) id) {
 			case 65530:
-				for (i = 0; i < _mapWidth * _mapHeight; i++)
+				for (int i = 0; i < _mapWidth * _mapHeight; i++)
 					_passMap[i] -= READ_VARO_UINT8(var + i);
 				break;
 			case 65531:
-				for (i = 0; i < _mapWidth * _mapHeight; i++)
+				for (int i = 0; i < _mapWidth * _mapHeight; i++)
 					_passMap[i] += READ_VARO_UINT8(var + i);
 				break;
 			case 65532:
-				for (i = 0; i < _mapWidth * _mapHeight; i++) 
+				for (int i = 0; i < _mapWidth * _mapHeight; i++) 
 					WRITE_VARO_UINT8(var + i, 0x00);
 				break;
 			case 65533:
@@ -88,6 +87,9 @@
 			case 65535:
 				_passMap = (int8 *) _vm->_inter->_variables->getAddressOff8(var);
 				break;
+			default:
+				warning("Map_v2::loadMapObjects(): ID == %d", (uint16) id);
+				break;
 		}
 		return;
 	}


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