[freesci-develop] r1515 - in freesci/trunk: . src/gfx/resource

[jameson]

Author: jameson
Date: 2006-02-04 21:27:12 +0100 (Sat, 04 Feb 2006)
New Revision: 1515

Modified:
   freesci/trunk/ChangeLog
   freesci/trunk/src/gfx/resource/sci_resmgr.c
Log:
* Properly initialise cursor IDs

  Per-resource colouring should now work no better or worse
than in Glutton.

-- Christoph



Modified: freesci/trunk/ChangeLog
===================================================================
--- freesci/trunk/ChangeLog     2006-02-04 19:53:29 UTC (rev 1514)
+++ freesci/trunk/ChangeLog     2006-02-04 20:27:12 UTC (rev 1515)
@@ -1,5 +1,8 @@
 2006-02-04  Christoph Reichenbach  <address@hidden>
 
+       * src/gfx/resource/sci_resmgr.c (gfxr_interpreter_get_cursor):
+       Cursor IDs are now initialised properly
+
        * src/gfx/gfx_res_options.c (apply_mod): Back-ported resource
        options
 

Modified: freesci/trunk/src/gfx/resource/sci_resmgr.c
===================================================================
--- freesci/trunk/src/gfx/resource/sci_resmgr.c 2006-02-04 19:53:29 UTC (rev 
1514)
+++ freesci/trunk/src/gfx/resource/sci_resmgr.c 2006-02-04 20:27:12 UTC (rev 
1515)
@@ -169,6 +169,7 @@
        resource_mgr_t *resmgr = (resource_mgr_t *) state->misc_payload;
        resource_t *res = scir_find_resource(resmgr, sci_cursor, nr, 0);
        gfx_sci_options_t *sci_options = (gfx_sci_options_t *) internal;
+       int resid = GFXR_RES_ID(GFX_RESOURCE_TYPE_CURSOR, nr);
 
        if (!res || !res->data)
                return NULL;
@@ -179,9 +180,9 @@
        }
 
        if (state->version == SCI_VERSION_0)
-               return gfxr_draw_cursor0(res->id, res->data, res->size);
+               return gfxr_draw_cursor0(resid, res->data, res->size);
        else
-               return gfxr_draw_cursor01(res->id, res->data, res->size);
+               return gfxr_draw_cursor01(resid, res->data, res->size);
 }