[Scummvm-cvs-logs] scummvm master -> 374bd9afc5f1d4b21bc446979dcd3feaa3072473

[dreammaster]

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:
f16dd2a7f2 MADS: Minor fixes for sprite asset flags passing
374bd9afc5 MADS: Add missing sprites removal from resetScene


Commit: f16dd2a7f270fdbf116657dad13817f9b36a6a96
    https://github.com/scummvm/scummvm/commit/f16dd2a7f270fdbf116657dad13817f9b36a6a96
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-01T11:48:19-04:00

Commit Message:
MADS: Minor fixes for sprite asset flags passing

Changed paths:
    engines/mads/assets.cpp
    engines/mads/palette.cpp



diff --git a/engines/mads/assets.cpp b/engines/mads/assets.cpp
index 82585d5..a2d495f 100644
--- a/engines/mads/assets.cpp
+++ b/engines/mads/assets.cpp
@@ -101,7 +101,7 @@ void SpriteAsset::load(Common::SeekableReadStream *stream, int flags) {
 	if (flags & (ASSET_TRANSLATE | ASSET_SPINNING_OBJECT)) {
 		_usageIndex = 0;
 
-		if (flags & 8) {
+		if (flags & ASSET_SPINNING_OBJECT) {
 			int newPalCtr = 0;
 
 			for (uint i = 0; i < palette.size(); ++i) {
@@ -131,7 +131,7 @@ void SpriteAsset::load(Common::SeekableReadStream *stream, int flags) {
 			}
 		}
 	} else {
-		_usageIndex = _vm->_palette->_paletteUsage.process(palette, flags);
+		_usageIndex = _vm->_palette->_paletteUsage.process(palette, flags & 0xF800);
 		assert(_usageIndex >= 0);
 	}
 
diff --git a/engines/mads/palette.cpp b/engines/mads/palette.cpp
index 0028548..f8670c7 100644
--- a/engines/mads/palette.cpp
+++ b/engines/mads/palette.cpp
@@ -285,7 +285,7 @@ void PaletteUsage::resetPalFlags(int idx) {
 				*flagP = 0;
 		}
 
-		_vm->_palette->_rgbList[idx] = 0;
+		_vm->_palette->_rgbList[idx] = false;
 	}
 }
 


Commit: 374bd9afc5f1d4b21bc446979dcd3feaa3072473
    https://github.com/scummvm/scummvm/commit/374bd9afc5f1d4b21bc446979dcd3feaa3072473
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-06-01T11:48:47-04:00

Commit Message:
MADS: Add missing sprites removal from resetScene

Changed paths:
    engines/mads/scene.cpp



diff --git a/engines/mads/scene.cpp b/engines/mads/scene.cpp
index 2afbcef..0a45ee4 100644
--- a/engines/mads/scene.cpp
+++ b/engines/mads/scene.cpp
@@ -674,6 +674,7 @@ void Scene::changeVariant(int variant) {
 
 void Scene::resetScene() {
 	_vm->_game->clearQuotes();
+	removeSprites();
 	_spriteSlots.fullRefresh(true);
 	_sequences.clear();
 }