[Scummvm-cvs-logs] SF.net SVN: scummvm:[45033] scummvm/trunk/engines/sci/gfx

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Tue Oct 13 19:51:10 CEST 2009


Revision: 45033
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45033&view=rev
Author:   thebluegr
Date:     2009-10-13 17:51:10 +0000 (Tue, 13 Oct 2009)

Log Message:
-----------
Removed some leftover cursor code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
    scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
    scummvm/trunk/engines/sci/gfx/gfx_resource.h

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-10-13 17:50:27 UTC (rev 45032)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.cpp	2009-10-13 17:51:10 UTC (rev 45033)
@@ -644,53 +644,4 @@
 	}
 }
 
-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

Modified: scummvm/trunk/engines/sci/gfx/gfx_resmgr.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-10-13 17:50:27 UTC (rev 45032)
+++ scummvm/trunk/engines/sci/gfx/gfx_resmgr.h	2009-10-13 17:51:10 UTC (rev 45033)
@@ -124,15 +124,6 @@
 
 
 	/**
-	 * 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

Modified: scummvm/trunk/engines/sci/gfx/gfx_resource.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resource.h	2009-10-13 17:50:27 UTC (rev 45032)
+++ scummvm/trunk/engines/sci/gfx/gfx_resource.h	2009-10-13 17:51:10 UTC (rev 45033)
@@ -248,17 +248,6 @@
  */
 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);
 /** @} */
 
 


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