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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Mon Oct 5 12:27:00 CEST 2009


Revision: 44657
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44657&view=rev
Author:   thebluegr
Date:     2009-10-05 10:27:00 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Removed dead code

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

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-10-05 09:23:59 UTC (rev 44656)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-10-05 10:27:00 UTC (rev 44657)
@@ -1468,23 +1468,6 @@
 		error("[GFX] Attempt to verify loop/cel values for invalid view %d", nr);
 }
 
-void gfxop_overflow_cel(GfxState *state, int nr, int *loop, int *cel) {
-	int loop_v = *loop;
-	int cel_v = *cel;
-
-	gfxr_view_t *testView = state->gfxResMan->getView(nr, &loop_v, &cel_v, 0);
-
-	if (!testView)
-		error("[GFX] Attempt to verify loop/cel values for invalid view %d", nr);
-
-	if (loop_v != *loop)
-		*loop = 0;
-
-	if (loop_v != *loop
-	        || cel_v != *cel)
-		*cel = 0;
-}
-
 void gfxop_get_cel_parameters(GfxState *state, int nr, int loop, int cel, int *width, int *height, Common::Point *offset) {
 	gfxr_view_t *view = NULL;
 	gfx_pixmap_t *pxm = NULL;
@@ -1625,10 +1608,8 @@
 // FIXME: only the resstate member of state is used -- inline the reference by:
 // replacing GfxState* state parameter with gfx_resstate_t* gfxResourceState and adjust callers accordingly
 int gfxop_get_font_height(GfxState *state, int font_nr) {
-	gfx_bitmap_font_t *font;
+	gfx_bitmap_font_t *font = state->gfxResMan->getFont(font_nr);
 
-	font = state->gfxResMan->getFont(font_nr);
-
 	if (!font)
 		error("gfxop_get_font_height(): Font number %d not found", font_nr);
 

Modified: scummvm/trunk/engines/sci/gfx/operations.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.h	2009-10-05 09:23:59 UTC (rev 44656)
+++ scummvm/trunk/engines/sci/gfx/operations.h	2009-10-05 10:27:00 UTC (rev 44657)
@@ -455,16 +455,6 @@
 void gfxop_check_cel(GfxState *state, int nr, int *loop, int *cel);
 
 /**
- * Resets loop/cel values to zero if they have become invalid.
- *
- * @param[in] state	The state to use
- * @param[in] nr	Number of the view to use
- * @param[in] loop	Pointer to the variable storing the loop number to verify
- * @param[in] cel	Pointer to the variable storing the cel number to check
- */
-void gfxop_overflow_cel(GfxState *state, int nr, int *loop, int *cel);
-
-/**
  * Retrieves the width and height of a cel.
  *
  * @param[in] state		The state to use


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