diff options
author | 2008-03-03 01:51:31 +0000 | |
---|---|---|
committer | 2008-03-03 01:51:31 +0000 | |
commit | e31f9a631301dace92853014f9c8a909f7e02d3e (patch) | |
tree | 7a628da91c1e779225f87c96f5b80373e8496f38 /src/emu/tilemap.c | |
parent | 05702939cde6179483f2b0f586ec1fb696933e41 (diff) |
Normalized function pointer typedefs: they are now all
suffixed with _func. Did this throughout the core and
drivers I was familiar with.
Fixed gcc compiler error with recent render.c changes.
gcc does not like explicit (int) casts on float or
double functions. This is fracking annoying and stupid,
but there you have it.
Diffstat (limited to 'src/emu/tilemap.c')
-rw-r--r-- | src/emu/tilemap.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index c0b86b15c9b..67d33907f0e 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -47,8 +47,8 @@ typedef enum /* internal blitting callbacks */ -typedef void (*blitmask_t)(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); -typedef void (*blitopaque_t)(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); +typedef void (*blitmask_func)(void *dest, const UINT16 *source, const UINT8 *maskptr, int mask, int value, int count, UINT8 *pri, UINT32 pcode); +typedef void (*blitopaque_func)(void *dest, const UINT16 *source, int count, UINT8 *pri, UINT32 pcode); /* blitting parameters for rendering */ @@ -57,8 +57,8 @@ struct _blit_parameters { bitmap_t * bitmap; rectangle cliprect; - blitmask_t draw_masked; - blitopaque_t draw_opaque; + blitmask_func draw_masked; + blitopaque_func draw_opaque; UINT32 tilemap_priority_code; UINT8 mask; UINT8 value; @@ -79,14 +79,14 @@ struct _tilemap UINT32 height; /* height of the full tilemap in pixels */ /* logical <-> memory mappings */ - tilemap_mapper_callback mapper; /* callback to map a row/column to a memory index */ + tilemap_mapper_func mapper; /* callback to map a row/column to a memory index */ tilemap_logical_index * memory_to_logical; /* map from memory index to logical index */ tilemap_logical_index max_logical_index; /* maximum valid logical index */ tilemap_memory_index * logical_to_memory; /* map from logical index to memory index */ tilemap_memory_index max_memory_index; /* maximum valid memory index */ /* callback to interpret video RAM for the tilemap */ - tile_get_info_callback tile_get_info; /* callback to get information about a tile */ + tile_get_info_func tile_get_info; /* callback to get information about a tile */ tile_data tileinfo; /* structure to hold the data for a tile */ void * user_data; /* user data value passed to the callback */ @@ -287,7 +287,7 @@ void tilemap_init(running_machine *machine) tilemap_create - allocate a new tilemap -------------------------------------------------*/ -tilemap *tilemap_create(tile_get_info_callback tile_get_info, tilemap_mapper_callback mapper, int tilewidth, int tileheight, int cols, int rows) +tilemap *tilemap_create(tile_get_info_func tile_get_info, tilemap_mapper_func mapper, int tilewidth, int tileheight, int cols, int rows) { tilemap *tmap; int group; |