[Scummvm-cvs-logs] scummvm master -> d11a1eea9480db3f86d19eab92aec08cd9eedf6f

[digitall]

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:
d11a1eea94 NEVERHOOD: Silence two compiler warnings about set but unused variables.


Commit: d11a1eea9480db3f86d19eab92aec08cd9eedf6f
    https://github.com/scummvm/scummvm/commit/d11a1eea9480db3f86d19eab92aec08cd9eedf6f
Author: D G Turner (digitall at scummvm.org)
Date: 2013-05-27T18:07:02-07:00

Commit Message:
NEVERHOOD: Silence two compiler warnings about set but unused variables.

Changed paths:
    engines/neverhood/microtiles.cpp
    engines/neverhood/modules/module2200.cpp



diff --git a/engines/neverhood/microtiles.cpp b/engines/neverhood/microtiles.cpp
index e19be52..3dd6475 100644
--- a/engines/neverhood/microtiles.cpp
+++ b/engines/neverhood/microtiles.cpp
@@ -118,8 +118,6 @@ RectangleList *MicroTileArray::getRectangles() {
 
 	for (y = 0; y < _tilesH; ++y) {
 		for (x = 0; x < _tilesW; ++x) {
-
-			int start;
 			int finish = 0;
 			BoundingBox boundingBox = _tiles[i];
 
@@ -132,8 +130,6 @@ RectangleList *MicroTileArray::getRectangles() {
 			y0 = (y * TileSize) + TileY0(boundingBox);
 			y1 = (y * TileSize) + TileY1(boundingBox);
 
-			start = i;
-
 			if (TileX1(boundingBox) == TileSize - 1 && x != _tilesW - 1) {	// check if the tile continues
 				while (!finish) {
 					++x;
diff --git a/engines/neverhood/modules/module2200.cpp b/engines/neverhood/modules/module2200.cpp
index 2b3b26f..4f2d9e8 100644
--- a/engines/neverhood/modules/module2200.cpp
+++ b/engines/neverhood/modules/module2200.cpp
@@ -683,7 +683,7 @@ static const uint32 kSsScene2202PuzzleCubeFileHashes2[] = {
 SsScene2202PuzzleCube::SsScene2202PuzzleCube(NeverhoodEngine *vm, Scene *parentScene, int16 cubePosition, int16 cubeSymbol)
 	: StaticSprite(vm, 900), _parentScene(parentScene), _cubeSymbol(cubeSymbol), _cubePosition(cubePosition), _isMoving(false) {
 
-	int surfacePriority;	
+	int surfacePriority;
 
 	SetUpdateHandler(&SsScene2202PuzzleCube::update);
 	SetMessageHandler(&SsScene2202PuzzleCube::handleMessage);
@@ -693,6 +693,7 @@ SsScene2202PuzzleCube::SsScene2202PuzzleCube(NeverhoodEngine *vm, Scene *parentS
 		surfacePriority = 300;
 	else
 		surfacePriority = 500;
+	debug(1, "TODO: Unused SurfacePriority: %d", surfacePriority);
 	loadSprite(kSsScene2202PuzzleCubeFileHashes2[_cubeSymbol], kSLFCenteredDrawOffset | kSLFSetPosition | kSLFDefCollisionBoundsOffset, 0,
 		kSsScene2202PuzzleCubePoints[_cubePosition].x, kSsScene2202PuzzleCubePoints[_cubePosition].y);
 	loadSound(0, 0x40958621);