[Scummvm-cvs-logs] scummvm master -> 772cbc122d4cbfc06021facaa687921a138b98ab

[Strangerke]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
15a10d2744 MADS: Remove a useless variable
1c8ecb41bd MADS: Fix signed/unsigned comparison warning
772cbc122d MADS: Fix a bug in PaletteUsage::process, some renaming


Commit: 15a10d27449d039dc01a712f2ad4bb93f062db01
    https://github.com/scummvm/scummvm/commit/15a10d27449d039dc01a712f2ad4bb93f062db01
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-31T12:41:03+01:00

Commit Message:
MADS: Remove a useless variable

Changed paths:
    engines/mads/events.cpp
    engines/mads/events.h



diff --git a/engines/mads/events.cpp b/engines/mads/events.cpp
index de4dc3c..e7ec8b0 100644
--- a/engines/mads/events.cpp
+++ b/engines/mads/events.cpp
@@ -44,7 +44,6 @@ EventsManager::EventsManager(MADSEngine *vm) {
 	_vD2 = 0;
 	_mouseStatusCopy = 0;
 	_mouseMoved = false;
-	_vD8 = 0;
 	_rightMousePressed = false;
 	_eventTarget = nullptr;
 }
@@ -261,7 +260,7 @@ void EventsManager::waitForNextFrame() {
 void EventsManager::initVars() {
 	_mousePos = Common::Point(-1, -1);
 	_mouseStatusCopy = _mouseStatus;
-	_vD2 = _vD8 = 0;
+	_vD2 = 0;
 }
 
 } // End of namespace MADS
diff --git a/engines/mads/events.h b/engines/mads/events.h
index 54df337..870d6e0 100644
--- a/engines/mads/events.h
+++ b/engines/mads/events.h
@@ -70,7 +70,6 @@ public:
 	int _vD2;
 	int _mouseStatusCopy;
 	bool _mouseMoved;
-	int _vD8;
 	Common::Stack<Common::Event> _pendingKeys;
 public:
 	/**


Commit: 1c8ecb41bde0bdaba132af3c6fc768813de6d26f
    https://github.com/scummvm/scummvm/commit/1c8ecb41bde0bdaba132af3c6fc768813de6d26f
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-31T12:41:46+01:00

Commit Message:
MADS: Fix signed/unsigned comparison warning

Changed paths:
    engines/mads/menu_views.h



diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h
index 871c0d1..f39ea4c 100644
--- a/engines/mads/menu_views.h
+++ b/engines/mads/menu_views.h
@@ -191,7 +191,7 @@ private:
 	int _manualFrame2;
 	int _animFrameNumber;
 	bool _nextCyclingActive;
-	int _scrollFrameCtr;
+	uint _scrollFrameCtr;
 private:
 	void load();
 


Commit: 772cbc122d4cbfc06021facaa687921a138b98ab
    https://github.com/scummvm/scummvm/commit/772cbc122d4cbfc06021facaa687921a138b98ab
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-01-31T12:42:36+01:00

Commit Message:
MADS: Fix a bug in PaletteUsage::process, some renaming

Changed paths:
    engines/mads/palette.cpp



diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 836d04f..95de307 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -178,31 +178,29 @@ int PaletteUsage::process(Common::Array<RGB6> &palette, uint flags) {
 		}
 
 		if (!changed && !noUsageFlag) {
-			int var2 = (palette[palIndex]._flags & 0x20) ||
-				(((flags & 0x2000) || (palette[palIndex]._flags & 0x4000)) &&
+			int bestHash = (palette[palIndex]._flags & 0x20) ||
+				(((flags & 0x2000) || (palette[palIndex]._flags & 0x40)) &&
 				((flags & 0x1000) || (palCount == 0))) ? 0x7fff : 1;
 			int var36 = (palette[palIndex]._flags & 0x80) ? 0 : 2;
 
 			for (int idx = palLow; idx < palIdx; ++idx) {
 				uint32 v = _vm->_palette->_palFlags[idx];
 				if ((v & var3A) && !(v & var36)) {
-					int var10;
-
-					if (var2 > 1) {
-						var10 = rgbFactor(&_vm->_palette->_mainPalette[idx * 3], palette[palIndex]);
-					}
-					else if (_vm->_palette->_mainPalette[idx * 3] != palette[palIndex].r ||
+					int hash;
+					if (bestHash > 1) {
+						hash = rgbFactor(&_vm->_palette->_mainPalette[idx * 3], palette[palIndex]);
+					} else if (_vm->_palette->_mainPalette[idx * 3] != palette[palIndex].r ||
 							_vm->_palette->_mainPalette[idx * 3 + 1] != palette[palIndex].g ||
 							_vm->_palette->_mainPalette[idx * 3 + 2] != palette[palIndex].b) {
-						var10 = 1;
+						hash = 1;
 					} else {
-						var10 = 0;
+						hash = 0;
 					}
 
-					if (var2 > var10) {
+					if (bestHash > hash) {
 						changed = true;
 						newPalIndex = idx;
-						var2 = var10;
+						bestHash = hash;
 					}
 				}
 			}