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

1 files changed, 10 insertions, 10 deletions

diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp
index be2fe01c4d..78916be85c 100644
--- a/engines/mohawk/graphics.cpp
+++ b/engines/mohawk/graphics.cpp
@@ -136,13 +136,13 @@ void GraphicsManager::setPalette(uint16 id) {
 
 	uint16 colorStart = tpalStream->readUint16BE();
 	uint16 colorCount = tpalStream->readUint16BE();
-	byte *palette = new byte[colorCount * 4];
+	byte *palette = new byte[colorCount * 3];
 
 	for (uint16 i = 0; i < colorCount; i++) {
-		palette[i * 4] = tpalStream->readByte();
-		palette[i * 4 + 1] = tpalStream->readByte();
-		palette[i * 4 + 2] = tpalStream->readByte();
-		palette[i * 4 + 3] = tpalStream->readByte();
+		palette[i * 3 + 0] = tpalStream->readByte();
+		palette[i * 3 + 1] = tpalStream->readByte();
+		palette[i * 3 + 2] = tpalStream->readByte();
+		tpalStream->readByte();
 	}
 
 	delete tpalStream;
@@ -1005,13 +1005,13 @@ void LBGraphics::setPalette(uint16 id) {
 	if (_vm->isPreMohawk()) {
 		Common::SeekableSubReadStreamEndian *ctblStream = _vm->wrapStreamEndian(ID_CTBL, id);
 		uint16 colorCount = ctblStream->readUint16();
-		byte *palette = new byte[colorCount * 4];
+		byte *palette = new byte[colorCount * 3];
 
 		for (uint16 i = 0; i < colorCount; i++) {
-			palette[i * 4] = ctblStream->readByte();
-			palette[i * 4 + 1] = ctblStream->readByte();
-			palette[i * 4 + 2] = ctblStream->readByte();
-			palette[i * 4 + 3] = ctblStream->readByte();
+			palette[i * 3 + 0] = ctblStream->readByte();
+			palette[i * 3 + 1] = ctblStream->readByte();
+			palette[i * 3 + 2] = ctblStream->readByte();
+			ctblStream->readByte();
 		}
 
 		delete ctblStream;