[Scummvm-cvs-logs] SF.net SVN: scummvm:[39332] scummvm/trunk/engines/sci/gfx
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Wed Mar 11 18:09:30 CET 2009
Revision: 39332
http://scummvm.svn.sourceforge.net/scummvm/?rev=39332&view=rev
Author: thebluegr
Date: 2009-03-11 17:09:30 +0000 (Wed, 11 Mar 2009)
Log Message:
-----------
Untangled the parameters in gfxr_interpreter_get_view() as well. Updated comments
Modified Paths:
--------------
scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
scummvm/trunk/engines/sci/gfx/resmgr.cpp
scummvm/trunk/engines/sci/gfx/resource/res_manager.cpp
Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.h 2009-03-11 16:50:12 UTC (rev 39331)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.h 2009-03-11 17:09:30 UTC (rev 39332)
@@ -241,7 +241,7 @@
/* Retreives all resources of a specified type that are available from the interpreter
** Parameters: (gfx_resstate_t *) state: The relevant resource state
** (gfx_respirce_type_t) type: The resource type to query
-** (int) version: The interpreter type and version
+** (int) version: The interpreter version
** (int *) entries_nr: The variable the number of entries will eventually be stored in
** Returns : (int *) An array of resource numbers
** Unsupported/non-existing resources should return NULL here; this is equivalent to supported
@@ -279,23 +279,26 @@
** Returns : (int) GFX_ERROR if the resource could not be found, GFX_OK otherwise
*/
-gfxr_view_t *gfxr_interpreter_get_view(gfx_resstate_t *state, int nr, int palette);
+gfxr_view_t *gfxr_interpreter_get_view(ResourceManager* resourceManager, int nr, int palette, Palette* staticPalette, int version);
/* Instructs the interpreter-specific code to calculate a view
-** Parameters: (gfx_resstate_t *) state: The resource manager state
+** Parameters: (ResourceManager *) resourceManager: The resource manager
** (int) nr: The view resource number
+** (int) palette: The palette number to use
+** (Palette*) staticPalette: The static palette to use in VGA games
+** (int) version: The interpreter version
** Returns : (gfx_view_t *) The appropriate view, or NULL on error
*/
gfx_bitmap_font_t *gfxr_interpreter_get_font(ResourceManager *resourceManager, int nr);
/* Instructs the interpreter-specific code to calculate a font
-** Parameters: (gfx_resstate_t *) state: The resource manager state
+** Parameters: (ResourceManager *) resourceManager: The resource manager
** (int) nr: The font resource number
** Returns : (gfx_font_t *) The newly calculated font, or NULL on error
*/
gfx_pixmap_t *gfxr_interpreter_get_cursor(ResourceManager *resourceManager, int nr, int version);
/* Instructs the interpreter-specific code to calculate a cursor
-** Paramaters: (gfx_resstate_t *) state: The resource manager state
+** Parameters: (ResourceManager *) state: The resource manager
** (int nr): The cursor resource number
** (int version): The SCI version used
** Returns : (gfx_pixmap_t *) The cursor pixmap, or NULL on error
@@ -303,7 +306,8 @@
Palette *gfxr_interpreter_get_static_palette(ResourceManager *resourceManager, int version, int *colors_nr);
/* Retreives the static palette (palette 999) from the interpreter-specific code
-** Parameters: (int) version: Interpreter version to use
+** Parameters: (ResourceManager *) state: The resource manager
+** (int) version: Interpreter version to use
** (int *) colors_nr: Number of colors to use
** Returns : (gfx_pixmap_color_t *) *colors_nr static color entries
** if a static palette must be used, NULL otherwise
@@ -311,7 +315,8 @@
Palette *gfxr_interpreter_get_palette(ResourceManager *resourceManager, int version, int *colors_nr, int nr);
/* Retreives the static palette from the interpreter-specific code
-** Parameters: (int) version: Interpreter version to use
+** Parameters: (ResourceManager *) state: The resource manager
+** (int) version: Interpreter version to use
** (int *) colors_nr: Number of colors to use
** (int) nr: The palette to read
** Returns : (gfx_pixmap_color_t *) *colors_nr static color entries
Modified: scummvm/trunk/engines/sci/gfx/resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resmgr.cpp 2009-03-11 16:50:12 UTC (rev 39331)
+++ scummvm/trunk/engines/sci/gfx/resmgr.cpp 2009-03-11 17:09:30 UTC (rev 39332)
@@ -459,7 +459,7 @@
res = (gfx_resource_t *) sbtree_get(tree, nr);
if (!res || res->mode != hash) {
- view = gfxr_interpreter_get_view(state, nr, palette);
+ view = gfxr_interpreter_get_view(state->resManager, nr, palette, state->static_palette, state->version);
if (!view)
return NULL;
Modified: scummvm/trunk/engines/sci/gfx/resource/res_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/resource/res_manager.cpp 2009-03-11 16:50:12 UTC (rev 39331)
+++ scummvm/trunk/engines/sci/gfx/resource/res_manager.cpp 2009-03-11 17:09:30 UTC (rev 39332)
@@ -142,18 +142,17 @@
gfxr_view_t *gfxr_draw_view11(int id, byte *resource, int size);
-gfxr_view_t *gfxr_interpreter_get_view(gfx_resstate_t *state, int nr, int palette) {
- ResourceManager *resmgr = state->resManager;
- Resource *res = resmgr->findResource(kResourceTypeView, nr, 0);
+gfxr_view_t *gfxr_interpreter_get_view(ResourceManager* resourceManager, int nr, int palette, Palette* staticPalette, int version) {
+ Resource *res = resourceManager->findResource(kResourceTypeView, nr, 0);
int resid = GFXR_RES_ID(GFX_RESOURCE_TYPE_VIEW, nr);
gfxr_view_t *result = 0;
if (!res || !res->data)
return NULL;
- if (state->version < SCI_VERSION_01) palette = -1;
+ if (version < SCI_VERSION_01) palette = -1;
- switch (state->version) {
+ switch (version) {
case SCI_VERSION_0:
case SCI_VERSION_01:
result = gfxr_draw_view0(resid, res->data, res->size, palette);
@@ -162,7 +161,7 @@
case SCI_VERSION_01_VGA_ODD:
case SCI_VERSION_1_EARLY:
case SCI_VERSION_1_LATE:
- result = gfxr_draw_view1(resid, res->data, res->size, state->static_palette);
+ result = gfxr_draw_view1(resid, res->data, res->size, staticPalette);
break;
case SCI_VERSION_1_1:
case SCI_VERSION_32:
@@ -170,12 +169,12 @@
break;
}
- if (state->version >= SCI_VERSION_01_VGA) {
+ if (version >= SCI_VERSION_01_VGA) {
if (!result->palette) {
- result->palette = new Palette(state->static_palette->size());
+ result->palette = new Palette(staticPalette->size());
result->palette->name = "interpreter_get_view";
}
- gfxr_palettize_view(result, state->static_palette);
+ gfxr_palettize_view(result, staticPalette);
}
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list