diff options
Diffstat (limited to 'engines/sci')
-rw-r--r-- | engines/sci/gfx/gfx_resmgr.h | 4 | ||||
-rw-r--r-- | engines/sci/gfx/gfx_resource.h | 4 | ||||
-rw-r--r-- | engines/sci/gfx/gfx_system.h | 28 | ||||
-rw-r--r-- | engines/sci/gfx/gfx_tools.h | 4 | ||||
-rw-r--r-- | engines/sci/sfx/sfx_songlib.h | 4 |
5 files changed, 22 insertions, 22 deletions
diff --git a/engines/sci/gfx/gfx_resmgr.h b/engines/sci/gfx/gfx_resmgr.h index 2bb1e5642d..2f97dee8dc 100644 --- a/engines/sci/gfx/gfx_resmgr.h +++ b/engines/sci/gfx/gfx_resmgr.h @@ -35,7 +35,7 @@ namespace Sci { -typedef enum { +enum gfx_resource_type_t { GFX_RESOURCE_TYPE_VIEW = 0, GFX_RESOURCE_TYPE_PIC, GFX_RESOURCE_TYPE_FONT, @@ -44,7 +44,7 @@ typedef enum { /* FIXME: Add PAL resource */ GFX_RESOURCE_TYPES_NR /* Number of resource types that are to be supported */ -} gfx_resource_type_t; +}; #define GFX_RESOURCE_TYPE_0 GFX_RESOURCE_TYPE_VIEW diff --git a/engines/sci/gfx/gfx_resource.h b/engines/sci/gfx/gfx_resource.h index a081dcf724..761143447e 100644 --- a/engines/sci/gfx/gfx_resource.h +++ b/engines/sci/gfx/gfx_resource.h @@ -123,9 +123,9 @@ struct gfxr_view_t { }; -typedef enum { +enum gfxr_font_scale_filter_t { GFXR_FONT_SCALE_FILTER_NONE -} gfxr_font_scale_filter_t; +}; struct text_fragment_t { diff --git a/engines/sci/gfx/gfx_system.h b/engines/sci/gfx/gfx_system.h index 29d4646b34..fb2fcb1c20 100644 --- a/engines/sci/gfx/gfx_system.h +++ b/engines/sci/gfx/gfx_system.h @@ -332,60 +332,60 @@ enum gfx_return_value_t { }; -typedef enum {/* Map masks */ +enum gfx_map_mask_t {/* Map masks */ GFX_MASK_NONE = 0, GFX_MASK_VISUAL = 1, GFX_MASK_PRIORITY = 2, GFX_MASK_CONTROL = 4 -} gfx_map_mask_t; +}; /* 'no priority' mode */ #define GFX_NO_PRIORITY -1 /* Text alignment values */ -typedef enum { +enum gfx_alignment_t { ALIGN_RIGHT = -1, ALIGN_TOP = -1, ALIGN_CENTER = 1, ALIGN_LEFT = 0, ALIGN_BOTTOM = 0 -} gfx_alignment_t; +}; -typedef enum { +enum gfx_line_mode_t { GFX_LINE_MODE_CORRECT, /* Scaled separately */ GFX_LINE_MODE_FAST, /* Scaled by (xfact+yfact)/2 */ GFX_LINE_MODE_FINE /* Always drawn at width 1 */ -} gfx_line_mode_t; +}; -typedef enum { +enum gfx_brush_mode_t { GFX_BRUSH_MODE_SCALED, /* Just scale the brush pixels */ GFX_BRUSH_MODE_ELLIPSES, /* Replace pixels with ellipses */ GFX_BRUSH_MODE_RANDOM_ELLIPSES, /* Replace pixels with ellipses moved and re-scaled randomly */ GFX_BRUSH_MODE_MORERANDOM /* Distribute randomly */ -} gfx_brush_mode_t; +}; -typedef enum { +enum gfx_line_style_t { GFX_LINE_STYLE_NORMAL, GFX_LINE_STYLE_STIPPLED -} gfx_line_style_t; +}; -typedef enum { +enum gfx_rectangle_fill_t { GFX_SHADE_FLAT, /* Don't shade */ GFX_SHADE_VERTICALLY, /* Shade vertically */ GFX_SHADE_HORIZONTALLY /* Shade horizontally */ -} gfx_rectangle_fill_t; +}; -typedef enum { +enum gfx_color_mode_t { GFX_COLOR_MODE_AUTO = 0, /* Auto-detect- handled by the gfxop library */ GFX_COLOR_MODE_INDEX = 1, /* Index mode */ GFX_COLOR_MODE_HIGH = 2, /* High color mode (15bpp or 16 bpp) */ GFX_COLOR_MODE_TRUE = 4 /* True color mode (24 bpp padded to 32 bpp) */ -} gfx_color_mode_t; +}; } // End of namespace Sci diff --git a/engines/sci/gfx/gfx_tools.h b/engines/sci/gfx/gfx_tools.h index 958562815b..bdd834f895 100644 --- a/engines/sci/gfx/gfx_tools.h +++ b/engines/sci/gfx/gfx_tools.h @@ -34,11 +34,11 @@ namespace Sci { -typedef enum { +enum gfx_xlate_filter_t { GFX_XLATE_FILTER_NONE, GFX_XLATE_FILTER_LINEAR, GFX_XLATE_FILTER_TRILINEAR -} gfx_xlate_filter_t; +}; extern int gfx_crossblit_alpha_threshold; /* Crossblitting functions use this value as threshold diff --git a/engines/sci/sfx/sfx_songlib.h b/engines/sci/sfx/sfx_songlib.h index bf8dc8b5a9..4d88be623a 100644 --- a/engines/sci/sfx/sfx_songlib.h +++ b/engines/sci/sfx/sfx_songlib.h @@ -43,11 +43,11 @@ namespace Sci { typedef unsigned long song_handle_t; -typedef enum { +enum RESTORE_BEHAVIOR { RESTORE_BEHAVIOR_CONTINUE, /* restart a song when restored from a saved game */ RESTORE_BEHAVIOR_RESTART /* continue it from where it was */ -} RESTORE_BEHAVIOR; +}; struct song_t { song_handle_t handle; |