[Scummvm-cvs-logs] scummvm master -> feb2454eec77307b36de0e7841ec7f3ac2c82a11

[lordhoto]

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:
56b81877b9 IPHONE: Recreate mouse texture on palette changes when needed.
feb2454eec IPHONE: Initialize the palettes on startup.


Commit: 56b81877b9a18cfe5f448c051a683694552f15c9
    https://github.com/scummvm/scummvm/commit/56b81877b9a18cfe5f448c051a683694552f15c9
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-01-13T15:03:37-08:00

Commit Message:
IPHONE: Recreate mouse texture on palette changes when needed.

This fixes the color of the cursor in the Eye of the Beholder menu.

Changed paths:
    backends/platform/iphone/osys_video.mm



diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm
index ebe435c..a11bf32 100644
--- a/backends/platform/iphone/osys_video.mm
+++ b/backends/platform/iphone/osys_video.mm
@@ -148,6 +148,11 @@ void OSystem_IPHONE::setPalette(const byte *colors, uint start, uint num) {
 	}
 
 	dirtyFullScreen();
+
+	// Automatically update the mouse texture when the palette changes while the
+	// cursor palette is disabled.
+	if (!_mouseCursorPaletteEnabled && _mouseBuffer.format.bytesPerPixel == 1)
+		_mouseDirty = _mouseNeedTextureUpdate = true;
 }
 
 void OSystem_IPHONE::grabPalette(byte *colors, uint start, uint num) {


Commit: feb2454eec77307b36de0e7841ec7f3ac2c82a11
    https://github.com/scummvm/scummvm/commit/feb2454eec77307b36de0e7841ec7f3ac2c82a11
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-01-13T15:08:43-08:00

Commit Message:
IPHONE: Initialize the palettes on startup.

This hopefully fixes the occasional odd color flashes on startup.

Changed paths:
    backends/platform/iphone/osys_main.cpp



diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp
index f9b2a81..ed2c886 100644
--- a/backends/platform/iphone/osys_main.cpp
+++ b/backends/platform/iphone/osys_main.cpp
@@ -65,6 +65,10 @@ OSystem_IPHONE::OSystem_IPHONE() :
 	_touchpadModeEnabled = !iPhone_isHighResDevice();
 	_fsFactory = new POSIXFilesystemFactory();
 	initVideoContext();
+
+	memset(_gamePalette, 0, sizeof(_gamePalette));
+	memset(_gamePaletteRGBA5551, 0, sizeof(_gamePaletteRGBA5551));
+	memset(_mouseCursorPalette, 0, sizeof(_mouseCursorPalette));
 }
 
 OSystem_IPHONE::~OSystem_IPHONE() {