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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Apr 24 12:44:10 CEST 2009


Revision: 40102
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40102&view=rev
Author:   fingolfin
Date:     2009-04-24 10:44:10 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
SCI: Changed GFXERROR to be fatal

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

Modified: scummvm/trunk/engines/sci/gfx/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_system.h	2009-04-24 10:43:42 UTC (rev 40101)
+++ scummvm/trunk/engines/sci/gfx/gfx_system.h	2009-04-24 10:44:10 UTC (rev 40102)
@@ -37,8 +37,8 @@
 #define GFX_DEBUG
 
 /* General output macros */
-#  define GFXERROR sciprintf("GFX Error: %s, L%d:", __FILE__, __LINE__); sciprintf
-#  define GFXWARN sciprintf("GFX Warning: %s, L%d:", __FILE__, __LINE__); sciprintf
+#  define GFXERROR sciprintf("GFX Error: %s, L%d:", __FILE__, __LINE__); error
+#  define GFXWARN sciprintf("GFX Warning: %s, L%d:", __FILE__, __LINE__); warning
 #  ifdef GFX_DEBUG
 #    define GFXDEBUG sciprintf("GFX-debug: %s, L%d:", __FILE__, __LINE__); sciprintf
 #  else /* !GFX_DEBUG */

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-04-24 10:43:42 UTC (rev 40101)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-04-24 10:44:10 UTC (rev 40102)
@@ -214,7 +214,7 @@
 
 static int _gfxop_draw_pixmap(gfx_driver_t *driver, gfx_pixmap_t *pxm, int priority, int control,
 	rect_t src, rect_t dest, rect_t clip, int static_buf, gfx_pixmap_t *control_map, gfx_pixmap_t *priority_map) {
-	int error;
+	int err;
 	rect_t clipped_dest = gfx_rect(dest.x, dest.y, dest.width, dest.height);
 
 	if (control >= 0 || priority >= 0) {
@@ -237,18 +237,18 @@
 	src.width = clipped_dest.width;
 	src.height = clipped_dest.height;
 
-	error = _gfxop_install_pixmap(driver, pxm);
-	if (error)
-		return error;
+	err = _gfxop_install_pixmap(driver, pxm);
+	if (err)
+		return err;
 
 	DDIRTY(stderr, "\\-> Drawing to actual %d %d %d %d\n", clipped_dest.x / driver->mode->xfact,
 	       clipped_dest.y / driver->mode->yfact, clipped_dest.width / driver->mode->xfact, clipped_dest.height / driver->mode->yfact);
 
-	error = driver->draw_pixmap(driver, pxm, priority, src, clipped_dest, static_buf ? GFX_BUFFER_STATIC : GFX_BUFFER_BACK);
+	err = driver->draw_pixmap(driver, pxm, priority, src, clipped_dest, static_buf ? GFX_BUFFER_STATIC : GFX_BUFFER_BACK);
 
-	if (error) {
-		GFXERROR("driver->draw_pixmap() returned error!\n");
-		return error;
+	if (err) {
+		GFXERROR("driver->draw_pixmap() returned err!\n");
+		return err;
 	}
 
 	return GFX_OK;
@@ -1036,14 +1036,14 @@
 }
 
 static int _gfxop_buffer_propagate_box(gfx_state_t *state, rect_t box, gfx_buffer_t buffer) {
-	int error;
+	int err;
 
 	if (_gfxop_clip(&box, gfx_rect(0, 0, 320 * state->driver->mode->xfact, 200 * state->driver->mode->yfact)))
 		return GFX_OK;
 
-	if ((error = state->driver->update(state->driver, box, Common::Point(box.x, box.y), buffer))) {
+	if ((err = state->driver->update(state->driver, box, Common::Point(box.x, box.y), buffer))) {
 		GFXERROR("Error occured while updating region (%d,%d,%d,%d) in buffer %d\n", box.x, box.y, box.width, box.height, buffer);
-		return error;
+		return err;
 	}
 
 	return GFX_OK;
@@ -1930,14 +1930,14 @@
 								  gfx_alignment_t valign, gfx_color_t color1, gfx_color_t color2, gfx_color_t bg_color, int flags) {
 	gfx_text_handle_t *handle;
 	gfx_bitmap_font_t *font;
-	int i, error = 0;
+	int i, err = 0;
 	BASIC_CHECKS(NULL);
 
 	// mapping text colors to palette
-	error |= gfxop_set_color(state, &color1, color1);
-	error |= gfxop_set_color(state, &color2, color2);
-	error |= gfxop_set_color(state, &bg_color, bg_color);
-	if (error) {
+	err |= gfxop_set_color(state, &color1, color1);
+	err |= gfxop_set_color(state, &color2, color2);
+	err |= gfxop_set_color(state, &bg_color, bg_color);
+	if (err) {
 		GFXERROR("Unable to set up colors");
 		return NULL;
 	}


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