[Scummvm-cvs-logs] scummvm master -> 460645393e7333427f67d0a567edbd60d9b69b7b

Strangerke Strangerke at scummvm.org
Fri Feb 28 23:35:18 CET 2014


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:
a8e17552ce TOON: Remove double identical check.
460645393e TOON: Reduce the scope of a couple of variables.


Commit: a8e17552ce9ec9174132ee658fc69f12af53b60d
    https://github.com/scummvm/scummvm/commit/a8e17552ce9ec9174132ee658fc69f12af53b60d
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-28T14:33:19-08:00

Commit Message:
TOON: Remove double identical check.

Changed paths:
    engines/toon/toon.cpp



diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index ea87c9b..3671422 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -3615,7 +3615,7 @@ int32 ToonEngine::handleInventoryOnInventory(int32 itemDest, int32 itemSrc) {
 			createMouseItem(21);
 			rearrangeInventory();
 			return 1;
-		} else if (itemSrc == 0x6b || itemSrc == 0x6c || itemSrc == 0x6f || itemSrc == 108 || itemSrc == 112) {
+		} else if (itemSrc == 0x6b || itemSrc == 0x6c || itemSrc == 0x6f || itemSrc == 0x70) {
 			sayLines(2, 1292);
 			return 1;
 		}


Commit: 460645393e7333427f67d0a567edbd60d9b69b7b
    https://github.com/scummvm/scummvm/commit/460645393e7333427f67d0a567edbd60d9b69b7b
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-28T14:33:39-08:00

Commit Message:
TOON: Reduce the scope of a couple of variables.

Changed paths:
    engines/toon/picture.cpp



diff --git a/engines/toon/picture.cpp b/engines/toon/picture.cpp
index f0a7154..51077c0 100644
--- a/engines/toon/picture.cpp
+++ b/engines/toon/picture.cpp
@@ -268,15 +268,14 @@ void Picture::floodFillNotWalkableOnMask(int16 x, int16 y) {
 	// Stack-based floodFill algorithm based on
 	// http://student.kuleuven.be/~m0216922/CG/files/floodfill.cpp
 	Common::Stack<Common::Point> stack;
-	bool spanLeft, spanRight;
 	stack.push(Common::Point(x, y));
 	while (!stack.empty()) {
 		Common::Point pt = stack.pop();
 		while (_data[pt.x + pt.y * _width] & 0x1F && pt.y >= 0)
 			pt.y--;
 		pt.y++;
-		spanLeft = false;
-		spanRight = false;
+		bool spanLeft = false;
+		bool spanRight = false;
 		while (_data[pt.x + pt.y * _width] & 0x1F && pt.y < _height) {
 			_data[pt.x + pt.y * _width] &= 0xE0;
 			if (!spanLeft && pt.x > 0 && _data[pt.x - 1 + pt.y * _width] & 0x1F) {






More information about the Scummvm-git-logs mailing list