Merge branch 'osystem-palette' of https://github.com/lordhoto/scummvm into master

Conflicts:
	backends/platform/android/android.cpp
	engines/sci/graphics/screen.cpp
	engines/sci/graphics/transitions.cpp

2 files changed, 44 insertions, 41 deletions

diff --git a/engines/sky/screen.cpp b/engines/sky/screen.cpp
index dae158e41b..a77017de38 100644
--- a/engines/sky/screen.cpp
+++ b/engines/sky/screen.cpp
@@ -63,7 +63,7 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
 	_skyCompact = skyCompact;
 
 	int i;
-	uint8 tmpPal[1024];
+	uint8 tmpPal[VGA_COLOURS * 3];
 
 	_gameGrid = (uint8 *)malloc(GRID_X * GRID_Y * 2);
 	forceRefresh();
@@ -72,14 +72,13 @@ Screen::Screen(OSystem *pSystem, Disk *pDisk, SkyCompact *skyCompact) {
 	_scrollScreen = NULL;
 
 	//blank the first 240 colors of the palette
-	memset(tmpPal, 0, GAME_COLOURS * 4);
+	memset(tmpPal, 0, GAME_COLOURS * 3);
 
 	//set the remaining colors
 	for (i = 0; i < (VGA_COLOURS-GAME_COLOURS); i++) {
-		tmpPal[4 * GAME_COLOURS + i * 4] = (_top16Colours[i * 3] << 2) + (_top16Colours[i * 3] >> 4);
-		tmpPal[4 * GAME_COLOURS + i * 4 + 1] = (_top16Colours[i * 3 + 1] << 2) + (_top16Colours[i * 3 + 1] >> 4);
-		tmpPal[4 * GAME_COLOURS + i * 4 + 2] = (_top16Colours[i * 3 + 2] << 2) + (_top16Colours[i * 3 + 2] >> 4);
-		tmpPal[4 * GAME_COLOURS + i * 4 + 3] = 0x00;
+		tmpPal[3 * GAME_COLOURS + i * 3 + 0] = (_top16Colours[i * 3 + 0] << 2) + (_top16Colours[i * 3 + 0] >> 4);
+		tmpPal[3 * GAME_COLOURS + i * 3 + 1] = (_top16Colours[i * 3 + 1] << 2) + (_top16Colours[i * 3 + 1] >> 4);
+		tmpPal[3 * GAME_COLOURS + i * 3 + 2] = (_top16Colours[i * 3 + 2] << 2) + (_top16Colours[i * 3 + 2] >> 4);
 	}
 
 	//set the palette
@@ -116,8 +115,8 @@ void Screen::setPalette(uint8 *pal) {
 
 void Screen::setPaletteEndian(uint8 *pal) {
 #ifdef SCUMM_BIG_ENDIAN
-	uint8 endPalette[256 * 3];
-	for (uint16 cnt = 0; cnt < 256 * 3; cnt++)
+	uint8 endPalette[VGA_COLOURS * 3];
+	for (uint16 cnt = 0; cnt < VGA_COLOURS * 3; cnt++)
 		endPalette[cnt] = pal[cnt ^ 1];
 	convertPalette(endPalette, _palette);
 #else
@@ -128,12 +127,12 @@ void Screen::setPaletteEndian(uint8 *pal) {
 }
 
 void Screen::halvePalette() {
-	uint8 halfPalette[1024];
+	uint8 halfPalette[VGA_COLOURS * 3];
+
 	for (uint8 cnt = 0; cnt < GAME_COLOURS; cnt++) {
-		halfPalette[(cnt << 2) | 0] = _palette[(cnt << 2) | 0] >> 1;
-		halfPalette[(cnt << 2) | 1] = _palette[(cnt << 2) | 1] >> 1;
-		halfPalette[(cnt << 2) | 2] = _palette[(cnt << 2) | 2] >> 1;
-		halfPalette[(cnt << 2) | 3] = 0;
+		halfPalette[cnt * 3 + 0] = _palette[cnt * 3 + 0] >> 1;
+		halfPalette[cnt * 3 + 1] = _palette[cnt * 3 + 1] >> 1;
+		halfPalette[cnt * 3 + 2] = _palette[cnt * 3 + 2] >> 1;
 	}
 	_system->getPaletteManager()->setPalette(halfPalette, 0, GAME_COLOURS);
 }
@@ -165,14 +164,14 @@ void Screen::showScreen(uint8 *pScreen) {
 	_system->updateScreen();
 }
 
-void Screen::convertPalette(uint8 *inPal, uint8* outPal) { //convert 3 byte 0..63 rgb to 4byte 0..255 rgbx
+//convert 3 byte 0..63 rgb to 3 byte 0..255 rgb
+void Screen::convertPalette(uint8 *inPal, uint8* outPal) {
 	int i;
 
 	for (i = 0; i < VGA_COLOURS; i++) {
-		outPal[4 * i] = (inPal[3 * i] << 2) + (inPal[3 * i] >> 4);
-		outPal[4 * i + 1] = (inPal[3 * i + 1] << 2) + (inPal[3 * i + 1] >> 4);
-		outPal[4 * i + 2] = (inPal[3 * i + 2] << 2) + (inPal[3 * i + 2] >> 4);
-		outPal[4 * i + 3] = 0x00;
+		outPal[3 * i + 0] = (inPal[3 * i + 0] << 2) + (inPal[3 * i + 0] >> 4);
+		outPal[3 * i + 1] = (inPal[3 * i + 1] << 2) + (inPal[3 * i + 1] >> 4);
+		outPal[3 * i + 2] = (inPal[3 * i + 2] << 2) + (inPal[3 * i + 2] >> 4);
 	}
 }
 
@@ -248,7 +247,7 @@ void Screen::fnFadeDown(uint32 scroll) {
 		uint32 delayTime = _system->getMillis();
 		for (uint8 cnt = 0; cnt < 32; cnt++) {
 			delayTime += 20;
-			palette_fadedown_helper((uint32 *)_palette, GAME_COLOURS);
+			palette_fadedown_helper(_palette, GAME_COLOURS);
 			_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLOURS);
 			_system->updateScreen();
 			int32 waitTime = (int32)delayTime - _system->getMillis();
@@ -266,23 +265,24 @@ void Screen::fnFadeDown(uint32 scroll) {
 	}
 }
 
-void Screen::palette_fadedown_helper(uint32 *pal, uint num) {
-	byte *p = (byte *)pal;
-
+void Screen::palette_fadedown_helper(uint8 *pal, uint num) {
 	do {
-		if (p[0] >= 8)
-			p[0] -= 8;
+		if (pal[0] >= 8)
+			pal[0] -= 8;
 		else
-			p[0] = 0;
-		if (p[1] >= 8)
-			p[1] -= 8;
+			pal[0] = 0;
+
+		if (pal[1] >= 8)
+			pal[1] -= 8;
 		else
-			p[1] = 0;
-		if (p[2] >= 8)
-			p[2] -= 8;
+			pal[1] = 0;
+
+		if (pal[2] >= 8)
+			pal[2] -= 8;
 		else
-			p[2] = 0;
-		p += sizeof(uint32);
+			pal[2] = 0;
+
+		pal += 3;
 	} while (--num);
 }
 
@@ -296,20 +296,23 @@ void Screen::paletteFadeUp(uint16 fileNr) {
 }
 
 void Screen::paletteFadeUp(uint8 *pal) {
-	byte tmpPal[1024];
+	byte tmpPal[VGA_COLOURS * 3];
 
 	convertPalette(pal, tmpPal);
 
 	uint32 delayTime = _system->getMillis();
 	for (uint8 cnt = 1; cnt <= 32; cnt++) {
 		delayTime += 20;
+
 		for (uint8 colCnt = 0; colCnt < GAME_COLOURS; colCnt++) {
-			_palette[(colCnt << 2) | 0] = (tmpPal[(colCnt << 2) | 0] * cnt) >> 5;
-			_palette[(colCnt << 2) | 1] = (tmpPal[(colCnt << 2) | 1] * cnt) >> 5;
-			_palette[(colCnt << 2) | 2] = (tmpPal[(colCnt << 2) | 2] * cnt) >> 5;
+			_palette[colCnt * 3 + 0] = (tmpPal[colCnt * 3 + 0] * cnt) >> 5;
+			_palette[colCnt * 3 + 1] = (tmpPal[colCnt * 3 + 1] * cnt) >> 5;
+			_palette[colCnt * 3 + 2] = (tmpPal[colCnt * 3 + 2] * cnt) >> 5;
 		}
+
 		_system->getPaletteManager()->setPalette(_palette, 0, GAME_COLOURS);
 		_system->updateScreen();
+
 		int32 waitTime = (int32)delayTime - _system->getMillis();
 		if (waitTime < 0)
 			waitTime = 0;
@@ -328,8 +331,8 @@ void Screen::fnFadeUp(uint32 palNum, uint32 scroll) {
 		if (palette == NULL)
 			error("Screen::fnFadeUp: can't fetch compact %X", palNum);
 #ifdef SCUMM_BIG_ENDIAN
-		byte tmpPal[256 * 3];
-		for (uint16 cnt = 0; cnt < 256*3; cnt++)
+		byte tmpPal[VGA_COLOURS * 3];
+		for (uint16 cnt = 0; cnt < VGA_COLOURS * 3; cnt++)
 			tmpPal[cnt] = palette[cnt ^ 1];
 		paletteFadeUp(tmpPal);
 #else
diff --git a/engines/sky/screen.h b/engines/sky/screen.h
index 5310aebeee..69a9a2fc8f 100644
--- a/engines/sky/screen.h
+++ b/engines/sky/screen.h
@@ -100,8 +100,8 @@ private:
 	OSystem *_system;
 	Disk *_skyDisk;
 	SkyCompact *_skyCompact;
-	static uint8 _top16Colours[16*3];
-	uint8 _palette[1024];
+	static uint8 _top16Colours[16 * 3];
+	uint8 _palette[VGA_COLOURS * 3];
 	uint32 _currentPalette;
 	uint8 _seqGrid[20 * 12];
 
@@ -121,7 +121,7 @@ private:
 
 	//- more regular screen.asm + layer.asm routines
 	void convertPalette(uint8 *inPal, uint8* outPal);
-	void palette_fadedown_helper(uint32 *pal, uint num);
+	void palette_fadedown_helper(uint8 *pal, uint num);
 
 	//- sprite.asm routines
 	// fixme: get rid of these globals