[Scummvm-cvs-logs] scummvm master -> 95ac0214aea59b777d61367a101dc7d932280d34

[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:
9b848dc7bd ACCESS: Add a constant for transparency
95ac0214ae ACCESS: Fix palette for inventory window


Commit: 9b848dc7bd48d7e1088b4fe2f26ea863aea3396d
    https://github.com/scummvm/scummvm/commit/9b848dc7bd48d7e1088b4fe2f26ea863aea3396d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-12-11T21:36:40-05:00

Commit Message:
ACCESS: Add a constant for transparency

Changed paths:
    engines/access/asurface.cpp



diff --git a/engines/access/asurface.cpp b/engines/access/asurface.cpp
index cb51431..f693e6a 100644
--- a/engines/access/asurface.cpp
+++ b/engines/access/asurface.cpp
@@ -28,6 +28,8 @@
 
 namespace Access {
 
+const int TRANSPARENCY = 0;
+
 SpriteResource::SpriteResource(AccessEngine *vm, Resource *res) {
 	Common::Array<uint32> offsets;
 	int count = res->_stream->readUint16LE();
@@ -64,7 +66,7 @@ SpriteFrame::SpriteFrame(AccessEngine *vm, Common::SeekableReadStream *stream, i
 
 	// Empty surface
 	byte *data = (byte *)getPixels();
-	Common::fill(data, data + w * h, 0);
+	Common::fill(data, data + w * h, TRANSPARENCY);
 
 	// Decode the data
 	for (int y = 0; y < h; ++y) {
@@ -202,7 +204,7 @@ void ASurface::transBlitFrom(ASurface *src, const Common::Point &destPos) {
 		byte *destP = (byte *)getBasePtr(destPos.x, destPos.y + yp);
 
 		for (int xp = 0; xp < this->w; ++xp, ++srcP, ++destP) {
-			if (*srcP != 0)
+			if (*srcP != TRANSPARENCY)
 				*destP = *srcP;
 		}
 	}


Commit: 95ac0214aea59b777d61367a101dc7d932280d34
    https://github.com/scummvm/scummvm/commit/95ac0214aea59b777d61367a101dc7d932280d34
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-12-11T21:37:42-05:00

Commit Message:
ACCESS: Fix palette for inventory window

Changed paths:
    engines/access/inventory.cpp



diff --git a/engines/access/inventory.cpp b/engines/access/inventory.cpp
index d4a869b..0a962aa 100644
--- a/engines/access/inventory.cpp
+++ b/engines/access/inventory.cpp
@@ -120,6 +120,7 @@ int InventoryManager::newDisplayInv() {
 	getList();
 	initFields();
 
+	files._setPaletteFlag = false;
 	files.loadScreen(&_vm->_buffer1, 99, 0);
 	_vm->_buffer1.copyTo(&_vm->_buffer2);
 	_vm->copyBF2Vid();