diff options
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.cpp | 49 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_resmgr.h | 9 | ||||
| -rw-r--r-- | engines/sci/gfx/gfx_resource.h | 11 |
3 files changed, 0 insertions, 69 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.cpp b/engines/sci/gfx/gfx_resmgr.cpp index 54a1150afb..e62e522d39 100644 --- a/engines/sci/gfx/gfx_resmgr.cpp +++ b/engines/sci/gfx/gfx_resmgr.cpp @@ -644,53 +644,4 @@ gfx_bitmap_font_t *GfxResManager::getFont(int num, bool scaled) { } } -gfx_pixmap_t *GfxResManager::getCursor(int num) { - IntResMap &resMap = _resourceMaps[GFX_RESOURCE_TYPE_CURSOR]; - gfx_resource_t *res = NULL; - int hash = getOptionsHash(GFX_RESOURCE_TYPE_CURSOR); - - res = resMap.contains(num) ? resMap[num] : NULL; - - if (!res || res->mode != hash) { - Resource *cursorRes = _resMan->findResource(ResourceId(kResourceTypeCursor, num), 0); - if (!cursorRes || !cursorRes->data) - return NULL; - - if (getSciVersion() >= SCI_VERSION_1_1) { - warning("[GFX] Attempt to retrieve cursor in SCI1.1 or later"); - return NULL; - } - - gfx_pixmap_t *cursor = gfxr_draw_cursor(GFXR_RES_ID(GFX_RESOURCE_TYPE_CURSOR, num), - cursorRes->data, cursorRes->size, getSciVersion() > SCI_VERSION_01); - - if (!cursor) - return NULL; - - if (!res) { - res = (gfx_resource_t *)malloc(sizeof(gfx_resource_t)); - res->scaled_data.pointer = NULL; - res->ID = GFXR_RES_ID(GFX_RESOURCE_TYPE_CURSOR, num); - res->lock_sequence_nr = _tagLockCounter; - res->mode = hash; - resMap[num] = res; - } else { - gfx_free_pixmap(res->unscaled_data.pointer); - } -#ifdef CUSTOM_GRAPHICS_OPTIONS - gfx_get_res_config(_options->res_conf, cursor); - gfx_xlate_pixmap(cursor, _driver->getMode()); -#else - gfx_xlate_pixmap(cursor, _driver->getMode()); -#endif - - res->unscaled_data.pointer = cursor; - - return cursor; - } else { - res->lock_sequence_nr = _tagLockCounter; // Update lock counter - return res->unscaled_data.pointer; - } -} - } // End of namespace Sci diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index f1faa929b3..1f03af0818 100644 --- a/engines/sci/gfx/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -124,15 +124,6 @@ public: /** - * Retrieves an SCI0/SCI01 mouse cursor. - * - * @param[in] num The cursor number - * @return The approprate cursor as a pixmap, or NULL on error - */ - gfx_pixmap_t *getCursor(int num); - - - /** * Retrieves a font. * * @param[in] num The font number diff --git a/engines/sci/gfx/gfx_resource.h b/engines/sci/gfx/gfx_resource.h index 7d1f279103..56fb16295a 100644 --- a/engines/sci/gfx/gfx_resource.h +++ b/engines/sci/gfx/gfx_resource.h @@ -248,17 +248,6 @@ void gfxr_remove_artifacts_pic0(gfxr_pic_t *dest, gfxr_pic_t *src); */ void gfxr_dither_pic0(gfxr_pic_t *pic, DitherMode mode); -/** - * Calculates a SCI cursor. - * - * @param[in] id The cursor's resource ID - * @param[in] resource Pointer to the resource data - * @param[in] size Resource size - * @param[in] isSci01 Set to true to load a SCI1 cursor - * @return A newly allocated pixmap containing an index color - * representation of the cursor - */ -gfx_pixmap_t *gfxr_draw_cursor(int id, byte *resource, int size, bool isSci01); /** @} */ |