[Scummvm-cvs-logs] scummvm master -> 08bef960733bbb71eaa90121d6e2d80da5914c29

[eriktorbjorn]

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:
15d6495755 ACCESS: Fix misleading comment
c01aa956b9 ACCESS: Use VGA_COLOR_TRANS() in setIconPalette()
08bef96073 ACCESS: Use VGA_COLOR_TRANS() in setManPalette()


Commit: 15d64957559a18e2a76f54f289e231b8b787aad9
    https://github.com/scummvm/scummvm/commit/15d64957559a18e2a76f54f289e231b8b787aad9
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-07-24T09:44:00+02:00

Commit Message:
ACCESS: Fix misleading comment

Changed paths:
    engines/access/martian/martian_game.cpp



diff --git a/engines/access/martian/martian_game.cpp b/engines/access/martian/martian_game.cpp
index 69ca4d3..09bb06b 100644
--- a/engines/access/martian/martian_game.cpp
+++ b/engines/access/martian/martian_game.cpp
@@ -165,7 +165,7 @@ void MartianEngine::doSpecial5(int param1) {
 }
 
 void MartianEngine::playGame() {
-	// Initialize Amazon game-specific objects
+	// Initialize Martian Memorandum game-specific objects
 	initObjects();
 
 	// Setup the game


Commit: c01aa956b9cf61b8c610e0e52dc9fa42188930ae
    https://github.com/scummvm/scummvm/commit/c01aa956b9cf61b8c610e0e52dc9fa42188930ae
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-07-24T10:08:08+02:00

Commit Message:
ACCESS: Use VGA_COLOR_TRANS() in setIconPalette()

This fixes the palette for Martian Memorandum's command icons and
mouse cursor.

Changed paths:
    engines/access/screen.cpp



diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 9392dec..978ba84 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -119,7 +119,9 @@ void Screen::setManPalette() {
 
 void Screen::setIconPalette() {
 	if (_vm->getGameID() == GType_MartianMemorandum) {
-		Common::copy(Martian::ICON_DATA, Martian::ICON_DATA + 0x1B, _rawPalette + 741);
+		for (int i = 0; i < 0x1B; i++) {
+			_rawPalette[741 + i] = VGA_COLOR_TRANS(Martian::ICON_DATA[i]);
+		}
 	}
 }
 


Commit: 08bef960733bbb71eaa90121d6e2d80da5914c29
    https://github.com/scummvm/scummvm/commit/08bef960733bbb71eaa90121d6e2d80da5914c29
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-07-24T10:14:28+02:00

Commit Message:
ACCESS: Use VGA_COLOR_TRANS() in setManPalette()

This fixes the palette for Tex in Martian Memorandum.

Changed paths:
    engines/access/screen.cpp



diff --git a/engines/access/screen.cpp b/engines/access/screen.cpp
index 978ba84..2d9a074 100644
--- a/engines/access/screen.cpp
+++ b/engines/access/screen.cpp
@@ -114,7 +114,9 @@ void Screen::setInitialPalettte() {
 }
 
 void Screen::setManPalette() {
-	Common::copy(_vm->_screen->_manPal, _vm->_screen->_manPal + 0x42, _rawPalette + 672);
+	for (int i = 0; i < 0x42; i++) {
+		_rawPalette[672 + i] = VGA_COLOR_TRANS(_manPal[i]);
+	}
 }
 
 void Screen::setIconPalette() {