[Scummvm-cvs-logs] SF.net SVN: scummvm:[41890] scummvm/trunk/engines/kyra/screen.cpp

[lordhoto at users.sourceforge.net]

Revision: 41890
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41890&view=rev
Author:   lordhoto
Date:     2009-06-25 23:04:08 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Cleanup palette setup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/screen.cpp

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2009-06-25 23:03:57 UTC (rev 41889)
+++ scummvm/trunk/engines/kyra/screen.cpp	2009-06-25 23:04:08 UTC (rev 41890)
@@ -125,22 +125,18 @@
 
 	memset(_palettes, 0, sizeof(_palettes));
 
-	_screenPalette = new Palette(256);
+	const int paletteCount = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? 12 : 4;
+	const int numColors = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? 32 : 256;
+
+	_screenPalette = new Palette(numColors);
 	assert(_screenPalette);
 
-	if (_vm->gameFlags().platform == Common::kPlatformAmiga) {
-		for (int i = 0; i < 12; ++i) {
-			_palettes[i] = new Palette(32);
-			assert(_palettes[i]);
-		}
-	} else {
-		for (int i = 0; i < 4; ++i) {
-			_palettes[i] = new Palette(256);
-			assert(_palettes[i]);
-		}
+	for (int i = 0; i < paletteCount; ++i) {
+		_palettes[i] = new Palette(numColors);
+		assert(_palettes[i]);
 	}
 
-	_internFadePalette = new Palette(_palettes[0]->getNumColors());
+	_internFadePalette = new Palette(numColors);
 	assert(_internFadePalette);
 
 	setScreenPalette(getPalette(0));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.