From e3f9acc3e6c66ab42e6e992536c933069771c99e Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 22 Mar 2009 23:11:43 +0000
Subject: Further objectification of the graphics resource manager

svn-id: r39621
---
 engines/sci/engine/game.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 6f2cf4b008..564bbf6598 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -125,22 +125,16 @@ int _reset_graphics_input(EngineState *s) {
 		// Check for Amiga palette file.
 		Common::File file;
 		if (file.open("spal")) {
-			if (s->gfx_state->resstate->static_palette)
-				s->gfx_state->resstate->static_palette->free();
-			s->gfx_state->resstate->static_palette = gfxr_read_pal1_amiga(file);
-			s->gfx_state->resstate->static_palette->name = "static palette";
+			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) {
-				if (s->gfx_state->resstate->static_palette)
-					s->gfx_state->resstate->static_palette->free();
 				if (s->version < SCI_VERSION(1, 001, 000))
-					s->gfx_state->resstate->static_palette = gfxr_read_pal1(999, resource->data, resource->size);
+					s->gfx_state->gfxResMan->setStaticPalette(gfxr_read_pal1(999, resource->data, resource->size));
 				else
-					s->gfx_state->resstate->static_palette = gfxr_read_pal11(999, resource->data, resource->size);
-				s->gfx_state->resstate->static_palette->name = "static palette";
+					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 {
-- 
cgit v1.2.3