[Scummvm-cvs-logs] scummvm master -> 643cbc6d161b4226c3e3c5c1125fa7b5b33e7282

[dreammaster]

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:
643cbc6d16 MADS: Fix palette corruption when changing selected inventor item


Commit: 643cbc6d161b4226c3e3c5c1125fa7b5b33e7282
    https://github.com/scummvm/scummvm/commit/643cbc6d161b4226c3e3c5c1125fa7b5b33e7282
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-04T21:53:14-04:00

Commit Message:
MADS: Fix palette corruption when changing selected inventor item

Changed paths:
    engines/mads/user_interface.cpp



diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index 3412748..fed6f78 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -995,8 +995,8 @@ void UserInterface::selectObject(int invIndex) {
 		noInventoryAnim();
 	} else {
 		loadInventoryAnim(_vm->_game->_objects._inventoryList[invIndex]);
-		_vm->_palette->setPalette(_vm->_palette->_mainPalette, 7, 1);
-		_vm->_palette->setPalette(_vm->_palette->_mainPalette, 246, 2);
+		_vm->_palette->setPalette(&_vm->_palette->_mainPalette[7 * 3], 7, 1);
+		_vm->_palette->setPalette(&_vm->_palette->_mainPalette[246 * 3], 246, 2);
 	}
 }