SCI: Got rid of include/scitypes.h

svn-id: r38746

4 files changed, 16 insertions, 16 deletions

diff --git a/engines/sci/gfx/gfx_resource.cpp b/engines/sci/gfx/gfx_resource.cpp
index 678f74ce83..463c3e378e 100644
--- a/engines/sci/gfx/gfx_resource.cpp
+++ b/engines/sci/gfx/gfx_resource.cpp
@@ -206,7 +206,7 @@ gfx_pixmap_t *gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode) {
 
 // Now construct the pixmap scaling functions
 #define EXTRA_BYTE_OFFSET 0
-#define SIZETYPE guint8
+#define SIZETYPE uint8
 #define FUNCNAME _gfx_xlate_pixmap_unfiltered_1
 #define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_1
 #define FUNCNAME_TRILINEAR _gfx_xlate_pixmap_trilinear_1
@@ -214,7 +214,7 @@ gfx_pixmap_t *gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode) {
 #include "gfx_pixmap_scale.cpp"
 #undef COPY_BYTES
 
-#define SIZETYPE guint16
+#define SIZETYPE uint16
 #define FUNCNAME _gfx_xlate_pixmap_unfiltered_2
 #define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_2
 #define FUNCNAME_TRILINEAR _gfx_xlate_pixmap_trilinear_2
@@ -226,7 +226,7 @@ gfx_pixmap_t *gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode) {
 # undef EXTRA_BYTE_OFFSET
 # define EXTRA_BYTE_OFFSET 1
 #endif // SCUMM_BIG_ENDIAN
-#define SIZETYPE guint32
+#define SIZETYPE uint32
 #define FUNCNAME _gfx_xlate_pixmap_unfiltered_3
 #define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_3
 #define FUNCNAME_TRILINEAR _gfx_xlate_pixmap_trilinear_3
@@ -238,7 +238,7 @@ gfx_pixmap_t *gfxr_endianness_adjust(gfx_pixmap_t *pixmap, gfx_mode_t *mode) {
 # define EXTRA_BYTE_OFFSET 0
 #endif // SCUMM_BIG_ENDIAN
 
-#define SIZETYPE guint32
+#define SIZETYPE uint32
 #define FUNCNAME _gfx_xlate_pixmap_unfiltered_4
 #define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_4
 #define FUNCNAME_TRILINEAR _gfx_xlate_pixmap_trilinear_4
diff --git a/engines/sci/gfx/gfx_system.h b/engines/sci/gfx/gfx_system.h
index 6aa2b98d2b..911a4dde97 100644
--- a/engines/sci/gfx/gfx_system.h
+++ b/engines/sci/gfx/gfx_system.h
@@ -114,13 +114,13 @@ struct gfx_mode_t {
 /** Pixmap-specific color entries */
 struct  gfx_pixmap_color_t{
 	int global_index; /* Global index color or GFX_COLOR_INDEX_UNMAPPED. */
-	guint8 r, g, b; /* Real color */
+	uint8 r, g, b; /* Real color */
 };
 
 /** Full color */
 struct gfx_color_t {
 	gfx_pixmap_color_t visual;
-	guint8 alpha; /* transparency = (1-opacity) */
+	uint8 alpha; /* transparency = (1-opacity) */
 	signed char priority, control;
 	byte mask; /* see mask values below */
 };
diff --git a/engines/sci/gfx/operations.cpp b/engines/sci/gfx/operations.cpp
index c4d6a9f471..4be7009c33 100644
--- a/engines/sci/gfx/operations.cpp
+++ b/engines/sci/gfx/operations.cpp
@@ -1182,17 +1182,17 @@ int gfxop_draw_box(gfx_state_t *state, rect_t box, gfx_color_t color1, gfx_color
 		draw_color1.priority = draw_color2.priority = color1.priority;
 
 		if (draw_color1.mask & GFX_MASK_VISUAL) {
-			draw_color1.visual.r = (guint8) COLOR_MIX(visual.r, mod_offset);
-			draw_color1.visual.g = (guint8) COLOR_MIX(visual.g, mod_offset);
-			draw_color1.visual.b = (guint8) COLOR_MIX(visual.b, mod_offset);
-			draw_color1.alpha = (guint8) COLOR_MIX(alpha, mod_offset);
+			draw_color1.visual.r = (uint8) COLOR_MIX(visual.r, mod_offset);
+			draw_color1.visual.g = (uint8) COLOR_MIX(visual.g, mod_offset);
+			draw_color1.visual.b = (uint8) COLOR_MIX(visual.b, mod_offset);
+			draw_color1.alpha = (uint8) COLOR_MIX(alpha, mod_offset);
 
 			mod_offset += mod_breadth;
 
-			draw_color2.visual.r = (guint8) COLOR_MIX(visual.r, mod_offset);
-			draw_color2.visual.g = (guint8) COLOR_MIX(visual.g, mod_offset);
-			draw_color2.visual.b = (guint8) COLOR_MIX(visual.b, mod_offset);
-			draw_color2.alpha = (guint8) COLOR_MIX(alpha, mod_offset);
+			draw_color2.visual.r = (uint8) COLOR_MIX(visual.r, mod_offset);
+			draw_color2.visual.g = (uint8) COLOR_MIX(visual.g, mod_offset);
+			draw_color2.visual.b = (uint8) COLOR_MIX(visual.b, mod_offset);
+			draw_color2.alpha = (uint8) COLOR_MIX(alpha, mod_offset);
 		}
 		if (reverse)
 			return drv->draw_filled_rect(drv, new_box, draw_color2, draw_color1, driver_shade_type);
diff --git a/engines/sci/gfx/resource/sci_view_1.cpp b/engines/sci/gfx/resource/sci_view_1.cpp
index 6da617c7ec..7af584bcfe 100644
--- a/engines/sci/gfx/resource/sci_view_1.cpp
+++ b/engines/sci/gfx/resource/sci_view_1.cpp
@@ -230,8 +230,8 @@ static int decompress_sci_view_amiga(int id, int loop, int cel, byte *resource,
 gfx_pixmap_t *gfxr_draw_cel1(int id, int loop, int cel, int mirrored, byte *resource, int size, gfxr_view_t *view, int amiga_game) {
 	int xl = get_int_16(resource);
 	int yl = get_int_16(resource + 2);
-	int xhot = (gint8) resource[4];
-	int yhot = (guint8) resource[5];
+	int xhot = (int8) resource[4];
+	int yhot = (uint8) resource[5];
 	int pos = 8;
 	int pixmap_size = xl * yl;
 	gfx_pixmap_t *retval = gfx_pixmap_alloc_index_data(gfx_new_pixmap(xl, yl, id, loop, cel));