[Scummvm-cvs-logs] scummvm master -> 1e78aa73bb1e54873bb195ab80e7fb773c0a48dd

bluegr md5 at scummvm.org
Tue Sep 27 16:01:18 CEST 2011


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:
4717d11862 SCI: Added support for the halfbrite palette used in Longbow Amiga
1e78aa73bb NEWS: Mention some SCI changes for 1.4.0


Commit: 4717d11862a45991b56f367cc6616ffb1379e8c6
    https://github.com/scummvm/scummvm/commit/4717d11862a45991b56f367cc6616ffb1379e8c6
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-27T06:54:14-07:00

Commit Message:
SCI: Added support for the halfbrite palette used in Longbow Amiga

This fixes the remaining palette problems in the game (bug #3309036)

Changed paths:
    engines/sci/graphics/palette.cpp



diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index c667e33..5f703b9 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -206,6 +206,14 @@ bool GfxPalette::setAmiga() {
 			_sysPalette.colors[curColor].r = (byte1 & 0x0F) * 0x11;
 			_sysPalette.colors[curColor].g = ((byte2 & 0xF0) >> 4) * 0x11;
 			_sysPalette.colors[curColor].b = (byte2 & 0x0F) * 0x11;
+
+			if (_totalScreenColors == 64) {
+				// Set the associated color from the Amiga halfbrite colors
+				_sysPalette.colors[curColor + 32].used = 1;
+				_sysPalette.colors[curColor + 32].r = _sysPalette.colors[curColor].r >> 1;
+				_sysPalette.colors[curColor + 32].g = _sysPalette.colors[curColor].g >> 1;
+				_sysPalette.colors[curColor + 32].b = _sysPalette.colors[curColor].b >> 1;
+			}
 		}
 
 		// Directly set the palette, because setOnScreen() wont do a thing for amiga
@@ -226,6 +234,13 @@ void GfxPalette::modifyAmigaPalette(byte *data) {
 		_sysPalette.colors[curColor].r = (byte1 & 0x0F) * 0x11;
 		_sysPalette.colors[curColor].g = ((byte2 & 0xF0) >> 4) * 0x11;
 		_sysPalette.colors[curColor].b = (byte2 & 0x0F) * 0x11;
+
+		if (_totalScreenColors == 64) {
+			// Set the associated color from the Amiga halfbrite colors
+			_sysPalette.colors[curColor + 32].r = _sysPalette.colors[curColor].r >> 1;
+			_sysPalette.colors[curColor + 32].g = _sysPalette.colors[curColor].g >> 1;
+			_sysPalette.colors[curColor + 32].b = _sysPalette.colors[curColor].b >> 1;
+		}
 	}
 
 	copySysPaletteToScreen();


Commit: 1e78aa73bb1e54873bb195ab80e7fb773c0a48dd
    https://github.com/scummvm/scummvm/commit/1e78aa73bb1e54873bb195ab80e7fb773c0a48dd
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-27T06:54:15-07:00

Commit Message:
NEWS: Mention some SCI changes for 1.4.0

- Longbow Amiga is now supported
- Mention the revised handling of game sound effects

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index dbdfbfd..029d515 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added support for Lands of Lore: The Throne of Chaos.
    - Added support for Blue's Birthday Adventure.
    - Added support for Ringworld: Revenge Of The Patriarch.
+   - Added support for the Amiga version of Conquests of the Longbow.
 
  New Ports:
    - Added PlayStation 3 port.
@@ -26,6 +27,12 @@ For a more comprehensive changelog of the latest experimental code, see:
  Lure:
    - Fixed crash when trying to talk and ask something at the same time.
 
+ SCI:
+   - Added better handling of digital vs. synthesized sound effects. If the
+     "Mixed Adlib / MIDI mode" checkbox is checked, the engine will prefer
+     digital sound effects, otherwise their synthesized counterparts will be
+     preferred instead, if both versions of the same effect exist.
+
  SCUMM:
    - Implemented PC Speaker support for SCUMM v5 games.
    - Fixed priority bug in iMuse. As a result the AdLib music should sound






More information about the Scummvm-git-logs mailing list