summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/tilemap.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-08-02 18:30:00 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-08-02 18:30:00 +0000
commit0df8391ad7fe54a51c84c3088a7e8ebc43b57744 (patch)
tree02540818797b7129c054ee63d45fac08fb0fcb57 /src/emu/tilemap.c
parent0ca4404705a039e503b72f1e4a431f41682a2d85 (diff)
> From: Atari Ace [mailto:atari_ace@verizon.net]
> Sent: Wednesday, July 22, 2009 8:18 PM > To: submit@mamedev.org > Cc: atariace@hotmail.com > Subject: [patch] priority_bitmap global begone! > > Hi mamedev, > > This patch set migrates priority_bitmap from a global variable to the > running_machine object. The first patch adds it to the machine > object, adjusting some routines to take a machine/screen object in > preparation and others to use a local variable for the bitmap. The > second patch then converts all the global vars to (typically) > machine->priority_bitmap, this patch was generated by the included > script. The last patch removes the global priority_bitmap. > > ~aa
Diffstat (limited to 'src/emu/tilemap.c')
-rw-r--r--src/emu/tilemap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c
index 71c9cb334bf..07fa6dc1ab3 100644
--- a/src/emu/tilemap.c
+++ b/src/emu/tilemap.c
@@ -126,8 +126,6 @@ struct _tilemap
GLOBAL VARIABLES
***************************************************************************/
-bitmap_t * priority_bitmap;
-
static tilemap * tilemap_list;
static tilemap ** tilemap_tailptr;
static int tilemap_instance;
@@ -303,7 +301,7 @@ void tilemap_init(running_machine *machine)
tilemap_tailptr = &tilemap_list;
tilemap_instance = 0;
- priority_bitmap = auto_bitmap_alloc(machine, screen_width, screen_height, BITMAP_FORMAT_INDEXED8);
+ machine->priority_bitmap = auto_bitmap_alloc(machine, screen_width, screen_height, BITMAP_FORMAT_INDEXED8);
add_exit_callback(machine, tilemap_exit);
}
}
@@ -1564,6 +1562,7 @@ static void configure_blit_parameters(blit_parameters *blit, tilemap *tmap, bitm
static void tilemap_draw_instance(tilemap *tmap, const blit_parameters *blit, int xpos, int ypos)
{
+ bitmap_t *priority_bitmap = tmap->machine->priority_bitmap;
bitmap_t *dest = blit->bitmap;
const UINT16 *source_baseaddr;
const UINT8 *mask_baseaddr;
@@ -1743,6 +1742,7 @@ static void tilemap_draw_roz_core(tilemap *tmap, const blit_parameters *blit,
UINT32 startx, UINT32 starty, int incxx, int incxy, int incyx, int incyy, int wraparound)
{
const pen_t *clut = &tmap->machine->pens[blit->tilemap_priority_code >> 16];
+ bitmap_t *priority_bitmap = tmap->machine->priority_bitmap;
bitmap_t *destbitmap = blit->bitmap;
bitmap_t *srcbitmap = tmap->pixmap;
bitmap_t *flagsmap = tmap->flagsmap;