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

[fingolfin at users.sourceforge.net]

Revision: 39105
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39105&view=rev
Author:   fingolfin
Date:     2009-03-04 05:09:35 +0000 (Wed, 04 Mar 2009)

Log Message:
-----------
SCI: Added TODO (rect_t should be replaced by Common::Rect), minor tweaks

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

Modified: scummvm/trunk/engines/sci/gfx/gfx_system.h
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_system.h	2009-03-04 05:00:15 UTC (rev 39104)
+++ scummvm/trunk/engines/sci/gfx/gfx_system.h	2009-03-04 05:09:35 UTC (rev 39105)
@@ -85,7 +85,7 @@
 	int xfact, yfact; /* Horizontal and vertical scaling factors */
 	int bytespp; /* Bytes per pixel */
 
-	unsigned int flags; /* GFX_MODE_FLAG_* Flags- see above */
+	uint32 flags; /* GFX_MODE_FLAG_* Flags- see above */
 
 
 	gfx_palette_t *palette; /* Palette or NULL to indicate non-palette mode.
@@ -93,7 +93,7 @@
 				** for bytespp=1.  */
 
 	/* Color masks */
-	unsigned int red_mask, green_mask, blue_mask, alpha_mask;
+	uint32 red_mask, green_mask, blue_mask, alpha_mask;
 	short red_shift, green_shift, blue_shift, alpha_shift;
 
 	/* Each of the mask/shift pairs describe where the corresponding color
@@ -121,13 +121,14 @@
 struct gfx_color_t {
 	gfx_pixmap_color_t visual;
 	uint8 alpha; /* transparency = (1-opacity) */
-	signed char priority, control;
+	int8 priority, control;
 	byte mask; /* see mask values below */
 };
 
 
+// TODO: Replace rect_t by Common::Rect
 /** Rectangle description */
-struct rect_t{
+struct rect_t {
 	int x, y;
 	int xl, yl; /* width, height: (x,y,xl,yl)=(5,5,1,1) occupies 1 pixel */
 };
@@ -257,7 +258,7 @@
 				    ** allowed for background pictures (which do
 				    ** not use transparency)
 				    */
-	unsigned int flags;
+	uint32 flags;
 
 	/*** Hot spot ***/
 	int xoffset, yoffset; /* x and y coordinates of the 'hot spot' (unscaled) */
@@ -340,7 +341,9 @@
 };
 
 /* 'no priority' mode */
-#define GFX_NO_PRIORITY -1
+enum {
+	GFX_NO_PRIORITY = -1
+};
 
 /* Text alignment values */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.