[Scummvm-cvs-logs] scummvm master -> 4f0d37d2f8628c63be1ed993d1332e146e36fac7

sev- sev at scummvm.org
Sun Sep 8 23:49:01 CEST 2013


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:
4c2dc5fb3f RECORDER: Fix warning
4f0d37d2f8 SWORD25: Remove unused variable


Commit: 4c2dc5fb3ffbd557af3f6cfa210ab90c30d1a120
    https://github.com/scummvm/scummvm/commit/4c2dc5fb3ffbd557af3f6cfa210ab90c30d1a120
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-08T14:46:03-07:00

Commit Message:
RECORDER: Fix warning

Changed paths:
    gui/EventRecorder.cpp



diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp
index 21152dd..71f6691 100644
--- a/gui/EventRecorder.cpp
+++ b/gui/EventRecorder.cpp
@@ -481,6 +481,8 @@ Common::List<Common::Event> EventRecorder::mapEvent(const Common::Event &ev, Com
 	default:
 		return Common::DefaultEventMapper::mapEvent(ev, source);
 	}
+
+	return Common::DefaultEventMapper::mapEvent(ev, source);
 }
 
 void EventRecorder::setGameMd5(const ADGameDescription *gameDesc) {


Commit: 4f0d37d2f8628c63be1ed993d1332e146e36fac7
    https://github.com/scummvm/scummvm/commit/4f0d37d2f8628c63be1ed993d1332e146e36fac7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-08T14:48:02-07:00

Commit Message:
SWORD25: Remove unused variable

Changed paths:
    engines/sword25/gfx/microtiles.cpp



diff --git a/engines/sword25/gfx/microtiles.cpp b/engines/sword25/gfx/microtiles.cpp
index 8dceed5..18e4a9a 100644
--- a/engines/sword25/gfx/microtiles.cpp
+++ b/engines/sword25/gfx/microtiles.cpp
@@ -119,7 +119,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 +131,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;






More information about the Scummvm-git-logs mailing list