From 968856780bb474dde5ea5685c079cbcd60230377 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 29 Mar 2009 21:46:49 +0000
Subject: SCI: Merge static palette into global palette at startup

svn-id: r39747
---
 engines/sci/engine/game.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sci/engine/game.cpp')

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 304752235b..03a8cc5b51 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -112,12 +112,13 @@ int _reset_graphics_input(EngineState *s) {
 			gfxop_set_system_color(s->gfx_state, i, &(s->ega_colors[i]));
 		}
 	} else {
+		_sci1_alloc_system_colors(s);
+
 		// Check for Amiga palette file.
 		Common::File file;
 		if (file.open("spal")) {
 			s->gfx_state->gfxResMan->setStaticPalette(gfxr_read_pal1_amiga(file));
 			file.close();
-			_sci1_alloc_system_colors(s);
 		} else {
 			resource = s->resmgr->findResource(kResourceTypePalette, 999, 1);
 			if (resource) {
@@ -125,7 +126,6 @@ int _reset_graphics_input(EngineState *s) {
 					s->gfx_state->gfxResMan->setStaticPalette(gfxr_read_pal1(999, resource->data, resource->size));
 				else
 					s->gfx_state->gfxResMan->setStaticPalette(gfxr_read_pal11(999, resource->data, resource->size));
-				_sci1_alloc_system_colors(s);
 				s->resmgr->unlockResource(resource, 999, kResourceTypePalette);
 			} else {
 				sciprintf("Couldn't find the default palette!\n");
-- 
cgit v1.2.3