diff options
author | Filippos Karapetis | 2009-03-22 23:11:43 +0000 |
---|---|---|
committer | Filippos Karapetis | 2009-03-22 23:11:43 +0000 |
commit | e3f9acc3e6c66ab42e6e992536c933069771c99e (patch) | |
tree | be078568570a92d40052a5149c382128684062ba /engines/sci/engine/game.cpp | |
parent | 052a6ea1f904079f85854cac9d255b7934130b84 (diff) | |
download | scummvm-rg350-e3f9acc3e6c66ab42e6e992536c933069771c99e.tar.gz scummvm-rg350-e3f9acc3e6c66ab42e6e992536c933069771c99e.tar.bz2 scummvm-rg350-e3f9acc3e6c66ab42e6e992536c933069771c99e.zip |
Further objectification of the graphics resource manager
svn-id: r39621
Diffstat (limited to 'engines/sci/engine/game.cpp')
-rw-r--r-- | engines/sci/engine/game.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
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 { |