Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-30 07:58:56 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix 01462: [Save/Restore] atarimo_render-based drivers:

Browse Source 
Crash when loading an autosave save state.

Removed excessive dirty tracking. This creates a bit more
work on each update, but gets rid of some dodgy logic.

Added typedefs for 'struct xxxx' to simply 'xxxx'.
This commit is contained in:
Aaron Giles 2008-03-17 16:39:18 +00:00
parent 91bc82c487
commit e499ad86e7
26 changed files with 185 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mame/drivers/batman.c
View File

@ -59,8 +59,8 @@ static void update_interrupts(running_machine *machine)
static MACHINE_RESET( batman ) static MACHINE_RESET( batman )
{ {
atarigen_eeprom_reset(); atarigen_eeprom_reset();
atarivc_reset(machine->primary_screen, atarivc_eof_data, 2);
atarigen_interrupt_reset(update_interrupts); atarigen_interrupt_reset(update_interrupts);
atarivc_reset(machine->primary_screen, atarivc_eof_data, 2);
atarigen_scanline_timer_reset(machine->primary_screen, batman_scanline_update, 8); atarigen_scanline_timer_reset(machine->primary_screen, batman_scanline_update, 8);
atarijsa_reset(); atarijsa_reset();
atarigen_init_save_state(); atarigen_init_save_state();

2
src/mame/drivers/offtwall.c
View File

@ -56,8 +56,8 @@ static void update_interrupts(running_machine *machine)
static MACHINE_RESET( offtwall ) static MACHINE_RESET( offtwall )
{ {
atarigen_eeprom_reset(); atarigen_eeprom_reset();
atarivc_reset(machine->primary_screen, atarivc_eof_data, 1);
atarigen_interrupt_reset(update_interrupts); atarigen_interrupt_reset(update_interrupts);
atarivc_reset(machine->primary_screen, atarivc_eof_data, 1);
atarijsa_reset(); atarijsa_reset();
} }

2
src/mame/drivers/relief.c
View File

@ -85,8 +85,8 @@ static WRITE16_HANDLER( relief_atarivc_w )
static MACHINE_RESET( relief ) static MACHINE_RESET( relief )
{ {
atarigen_eeprom_reset(); atarigen_eeprom_reset();
atarivc_reset(machine->primary_screen, atarivc_eof_data, 2);
atarigen_interrupt_reset(update_interrupts); atarigen_interrupt_reset(update_interrupts);
atarivc_reset(machine->primary_screen, atarivc_eof_data, 2);
OKIM6295_set_bank_base(0, 0); OKIM6295_set_bank_base(0, 0);
ym2413_volume = 15; ym2413_volume = 15;

2
src/mame/drivers/shuuz.c
View File

@ -73,8 +73,8 @@ static WRITE16_HANDLER( shuuz_atarivc_w )
static MACHINE_RESET( shuuz ) static MACHINE_RESET( shuuz )
{ {
atarigen_eeprom_reset(); atarigen_eeprom_reset();
atarivc_reset(machine->primary_screen, atarivc_eof_data, 1);
atarigen_interrupt_reset(update_interrupts); atarigen_interrupt_reset(update_interrupts);
atarivc_reset(machine->primary_screen, atarivc_eof_data, 1);
} }

2
src/mame/drivers/thunderj.c
View File

@ -59,8 +59,8 @@ static void update_interrupts(running_machine *machine)
static MACHINE_RESET( thunderj ) static MACHINE_RESET( thunderj )
{ {
atarigen_eeprom_reset(); atarigen_eeprom_reset();
atarivc_reset(machine->primary_screen, atarivc_eof_data, 2);
atarigen_interrupt_reset(update_interrupts); atarigen_interrupt_reset(update_interrupts);
atarivc_reset(machine->primary_screen, atarivc_eof_data, 2);
atarijsa_reset(); atarijsa_reset();
rom_base[0] = (UINT16 *)memory_region(REGION_CPU1); rom_base[0] = (UINT16 *)memory_region(REGION_CPU1);

6
src/mame/video/arcadecl.c
View File

@ -32,7 +32,7 @@ static UINT8 has_mo;
VIDEO_START( arcadecl ) VIDEO_START( arcadecl )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -94,11 +94,11 @@ VIDEO_UPDATE( arcadecl )
/* draw and merge the MO */ /* draw and merge the MO */
if (has_mo) if (has_mo)
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

176
src/mame/video/atarimo.c
View File

@ -1,21 +1,22 @@
/*########################################################################## /***************************************************************************
atarimo.c atarimo.c
Common motion object management functions for Atari raster games. Common motion object management functions for Atari raster games.
##########################################################################*/ ***************************************************************************/
#include "driver.h" #include "driver.h"
#include "atarimo.h" #include "atarimo.h"
/*########################################################################## /***************************************************************************
TYPES & STRUCTURES TYPES & STRUCTURES
##########################################################################*/ ***************************************************************************/
/* internal structure containing a word index, shift and mask */ /* internal structure containing a word index, shift and mask */
struct atarimo_mask typedef struct _atarimo_mask atarimo_mask;
struct _atarimo_mask
{ {
int word; /* word index */ int word; /* word index */
int shift; /* shift amount */ int shift; /* shift amount */
@ -23,10 +24,13 @@ struct atarimo_mask
}; };
/* internal structure containing the state of the motion objects */ /* internal structure containing the state of the motion objects */
struct atarimo_data typedef struct _atarimo_data atarimo_data;
struct _atarimo_data
{ {
running_machine * machine; /* pointer back to the machine */
UINT32 gfxchanged; /* true if the gfx info has changed */ UINT32 gfxchanged; /* true if the gfx info has changed */
gfx_element gfxelement[MAX_GFX_ELEMENTS]; /* local copy of graphics elements */ gfx_element gfxelement[MAX_GFX_ELEMENTS]; /* local copy of graphics elements */
int gfxgranularity[MAX_GFX_ELEMENTS]; int gfxgranularity[MAX_GFX_ELEMENTS];
bitmap_t *bitmap; /* temporary bitmap to render to */ bitmap_t *bitmap; /* temporary bitmap to render to */
@ -67,41 +71,40 @@ struct atarimo_data
int maxperline; /* maximum number of entries/line */ int maxperline; /* maximum number of entries/line */
struct atarimo_mask linkmask; /* mask for the link */ atarimo_mask linkmask; /* mask for the link */
struct atarimo_mask gfxmask; /* mask for the graphics bank */ atarimo_mask gfxmask; /* mask for the graphics bank */
struct atarimo_mask codemask; /* mask for the code index */ atarimo_mask codemask; /* mask for the code index */
struct atarimo_mask codehighmask; /* mask for the upper code index */ atarimo_mask codehighmask; /* mask for the upper code index */
struct atarimo_mask colormask; /* mask for the color */ atarimo_mask colormask; /* mask for the color */
struct atarimo_mask xposmask; /* mask for the X position */ atarimo_mask xposmask; /* mask for the X position */
struct atarimo_mask yposmask; /* mask for the Y position */ atarimo_mask yposmask; /* mask for the Y position */
struct atarimo_mask widthmask; /* mask for the width, in tiles*/ atarimo_mask widthmask; /* mask for the width, in tiles*/
struct atarimo_mask heightmask; /* mask for the height, in tiles */ atarimo_mask heightmask; /* mask for the height, in tiles */
struct atarimo_mask hflipmask; /* mask for the horizontal flip */ atarimo_mask hflipmask; /* mask for the horizontal flip */
struct atarimo_mask vflipmask; /* mask for the vertical flip */ atarimo_mask vflipmask; /* mask for the vertical flip */
struct atarimo_mask prioritymask; /* mask for the priority */ atarimo_mask prioritymask; /* mask for the priority */
struct atarimo_mask neighbormask; /* mask for the neighbor */ atarimo_mask neighbormask; /* mask for the neighbor */
struct atarimo_mask absolutemask; /* mask for absolute coordinates */ atarimo_mask absolutemask; /* mask for absolute coordinates */
struct atarimo_mask specialmask; /* mask for the special value */ atarimo_mask specialmask; /* mask for the special value */
int specialvalue; /* resulting value to indicate "special" */ int specialvalue; /* resulting value to indicate "special" */
atarimo_special_func specialcb; /* callback routine for special entries */ atarimo_special_func specialcb; /* callback routine for special entries */
int codehighshift; /* shift count for the upper code */ int codehighshift; /* shift count for the upper code */
struct atarimo_entry *spriteram; /* pointer to sprite RAM */ atarimo_entry * spriteram; /* pointer to sprite RAM */
UINT16 ** slipram; /* pointer to the SLIP RAM pointer */ UINT16 ** slipram; /* pointer to the SLIP RAM pointer */
UINT16 * codelookup; /* lookup table for codes */ UINT16 * codelookup; /* lookup table for codes */
UINT8 * colorlookup; /* lookup table for colors */ UINT8 * colorlookup; /* lookup table for colors */
UINT8 * gfxlookup; /* lookup table for graphics */ UINT8 * gfxlookup; /* lookup table for graphics */
struct atarimo_entry *activelist[ATARIMO_MAXPERBANK]; /* pointers to active motion objects */ atarimo_entry * activelist[ATARIMO_MAXPERBANK]; /* pointers to active motion objects */
struct atarimo_entry **activelast; /* pointer to the last pointer in the active list */ atarimo_entry ** activelast; /* pointer to the last pointer in the active list */
UINT32 last_link; /* previous starting point */
UINT8 * dirtygrid; /* grid of dirty rects for blending */ UINT8 * dirtygrid; /* grid of dirty rects for blending */
int dirtywidth; /* width of dirty grid */ int dirtywidth; /* width of dirty grid */
int dirtyheight; /* height of dirty grid */ int dirtyheight; /* height of dirty grid */
rectangle rectlist[ATARIMO_MAXPERBANK]; /* list of bounding rectangles */ rectangle rectlist[ATARIMO_MAXPERBANK]; /* list of bounding rectangles */
int rectcount; int rectcount;
UINT32 last_xpos; /* (during processing) the previous X position */ UINT32 last_xpos; /* (during processing) the previous X position */
@ -110,18 +113,18 @@ struct atarimo_data
/*########################################################################## /***************************************************************************
MACROS MACROS
##########################################################################*/ ***************************************************************************/
/* data extraction */ /* data extraction */
#define EXTRACT_DATA(_input, _mask) (((_input)->data[(_mask).word] >> (_mask).shift) & (_mask).mask) #define EXTRACT_DATA(_input, _mask) (((_input)->data[(_mask).word] >> (_mask).shift) & (_mask).mask)
/*########################################################################## /***************************************************************************
GLOBAL VARIABLES GLOBAL VARIABLES
##########################################################################*/ ***************************************************************************/
UINT16 *atarimo_0_spriteram; UINT16 *atarimo_0_spriteram;
UINT16 *atarimo_0_slipram; UINT16 *atarimo_0_slipram;
@ -131,25 +134,25 @@ UINT16 *atarimo_1_slipram;
/*########################################################################## /***************************************************************************
STATIC VARIABLES STATIC VARIABLES
##########################################################################*/ ***************************************************************************/
static struct atarimo_data atarimo[ATARIMO_MAX]; static atarimo_data atarimo[ATARIMO_MAX];
static emu_timer *force_update_timer; static emu_timer *force_update_timer;
/*########################################################################## /***************************************************************************
STATIC FUNCTION DECLARATIONS STATIC FUNCTION DECLARATIONS
##########################################################################*/ ***************************************************************************/
static int mo_render_object(running_machine *machine, struct atarimo_data *mo, const struct atarimo_entry *entry, const rectangle *cliprect); static int mo_render_object(atarimo_data *mo, const atarimo_entry *entry, const rectangle *cliprect);
/*########################################################################## /***************************************************************************
INLINE FUNCTIONS INLINE FUNCTIONS
##########################################################################*/ ***************************************************************************/
/*--------------------------------------------------------------- /*---------------------------------------------------------------
compute_log: Computes the number of bits necessary to compute_log: Computes the number of bits necessary to
@ -194,7 +197,7 @@ INLINE int round_to_powerof2(int value)
shift, and adjusted mask. Returns 0 if invalid. shift, and adjusted mask. Returns 0 if invalid.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
INLINE int convert_mask(const struct atarimo_entry *input, struct atarimo_mask *result) INLINE int convert_mask(const atarimo_entry *input, atarimo_mask *result)
{ {
int i, temp; int i, temp;
@ -234,30 +237,29 @@ INLINE int convert_mask(const struct atarimo_entry *input, struct atarimo_mask *
gives us full control over colors. gives us full control over colors.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
INLINE void init_gfxelement(running_machine *machine, struct atarimo_data *mo, int idx) INLINE void init_gfxelement(atarimo_data *mo, int idx)
{ {
mo->gfxelement[idx] = *machine->gfx[idx]; mo->gfxelement[idx] = *mo->machine->gfx[idx];
mo->gfxgranularity[idx] = mo->gfxelement[idx].color_granularity; mo->gfxgranularity[idx] = mo->gfxelement[idx].color_granularity;
mo->gfxelement[idx].color_granularity = 1; mo->gfxelement[idx].color_granularity = 1;
mo->gfxelement[idx].color_base = 0; mo->gfxelement[idx].color_base = 0;
mo->gfxelement[idx].total_colors = 65536; mo->gfxelement[idx].total_colors = 65536;
} }
static struct atarimo_data atarimo[ATARIMO_MAX]; static atarimo_data atarimo[ATARIMO_MAX];
static emu_timer *force_update_timer; static emu_timer *force_update_timer;
/*--------------------------------------------------------------- /*---------------------------------------------------------------
init_savestate: Initialize save states init_savestate: Initialize save states
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
static void init_savestate(int index, struct atarimo_data *mo) static void init_savestate(int index, atarimo_data *mo)
{ {
state_save_register_item("atarimo", index, mo->gfxchanged); state_save_register_item("atarimo", index, mo->gfxchanged);
state_save_register_item("atarimo", index, mo->palettebase); state_save_register_item("atarimo", index, mo->palettebase);
state_save_register_item("atarimo", index, mo->bank); state_save_register_item("atarimo", index, mo->bank);
state_save_register_item("atarimo", index, mo->xscroll); state_save_register_item("atarimo", index, mo->xscroll);
state_save_register_item("atarimo", index, mo->yscroll); state_save_register_item("atarimo", index, mo->yscroll);
state_save_register_item("atarimo", index, mo->last_link);
state_save_register_item("atarimo", index, mo->last_xpos); state_save_register_item("atarimo", index, mo->last_xpos);
state_save_register_item("atarimo", index, mo->next_xpos); state_save_register_item("atarimo", index, mo->next_xpos);
@ -297,7 +299,7 @@ static void init_savestate(int index, struct atarimo_data *mo)
state_save_register_bitmap("atarimo", index, "bitmap", mo->bitmap); state_save_register_bitmap("atarimo", index, "bitmap", mo->bitmap);
state_save_register_memory("atarimo", index, "spriteram", mo->spriteram, sizeof(struct atarimo_entry), mo->spriteramsize); state_save_register_memory("atarimo", index, "spriteram", mo->spriteram, sizeof(atarimo_entry), mo->spriteramsize);
state_save_register_item_pointer("atarimo", index, mo->codelookup, round_to_powerof2(mo->codemask.mask)); state_save_register_item_pointer("atarimo", index, mo->codelookup, round_to_powerof2(mo->codemask.mask));
@ -309,9 +311,9 @@ static void init_savestate(int index, struct atarimo_data *mo)
} }
/*########################################################################## /***************************************************************************
GLOBAL FUNCTIONS GLOBAL FUNCTIONS
##########################################################################*/ ***************************************************************************/
static TIMER_CALLBACK( force_update ) static TIMER_CALLBACK( force_update )
{ {
@ -332,10 +334,10 @@ static TIMER_CALLBACK( force_update )
the attribute lookup table. the attribute lookup table.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
void atarimo_init(running_machine *machine, int map, const struct atarimo_desc *desc) void atarimo_init(running_machine *machine, int map, const atarimo_desc *desc)
{ {
gfx_element *gfx = machine->gfx[desc->gfxindex]; gfx_element *gfx = machine->gfx[desc->gfxindex];
struct atarimo_data *mo = &atarimo[map]; atarimo_data *mo = &atarimo[map];
int i; int i;
assert_always(map >= 0 && map < ATARIMO_MAX, "atarimo_init: map out of range"); assert_always(map >= 0 && map < ATARIMO_MAX, "atarimo_init: map out of range");
@ -357,7 +359,8 @@ void atarimo_init(running_machine *machine, int map, const struct atarimo_desc *
convert_mask(&desc->absolutemask, &mo->absolutemask); convert_mask(&desc->absolutemask, &mo->absolutemask);
/* copy in the basic data */ /* copy in the basic data */
mo->gfxchanged = 0; mo->machine = machine;
mo->gfxchanged = FALSE;
mo->linked = desc->linked; mo->linked = desc->linked;
mo->split = desc->split; mo->split = desc->split;
@ -402,8 +405,6 @@ void atarimo_init(running_machine *machine, int map, const struct atarimo_desc *
mo->slipram = (map == 0) ? &atarimo_0_slipram : &atarimo_1_slipram; mo->slipram = (map == 0) ? &atarimo_0_slipram : &atarimo_1_slipram;
mo->last_link = -1;
/* allocate the temp bitmap */ /* allocate the temp bitmap */
mo->bitmap = video_screen_auto_bitmap_alloc(machine->primary_screen); mo->bitmap = video_screen_auto_bitmap_alloc(machine->primary_screen);
fillbitmap(mo->bitmap, desc->transpen, NULL); fillbitmap(mo->bitmap, desc->transpen, NULL);
@ -441,7 +442,7 @@ void atarimo_init(running_machine *machine, int map, const struct atarimo_desc *
mo->gfxlookup[i] = desc->gfxindex; mo->gfxlookup[i] = desc->gfxindex;
/* initialize the gfx elements so we have full control over colors */ /* initialize the gfx elements so we have full control over colors */
init_gfxelement(machine, mo, desc->gfxindex); init_gfxelement(mo, desc->gfxindex);
/* start a timer to update a few times during refresh */ /* start a timer to update a few times during refresh */
force_update_timer = timer_alloc(force_update, NULL); force_update_timer = timer_alloc(force_update, NULL);
@ -464,7 +465,7 @@ void atarimo_init(running_machine *machine, int map, const struct atarimo_desc *
UINT16 *atarimo_get_code_lookup(int map, int *size) UINT16 *atarimo_get_code_lookup(int map, int *size)
{ {
struct atarimo_data *mo = &atarimo[map]; atarimo_data *mo = &atarimo[map];
if (size) if (size)
*size = round_to_powerof2(mo->codemask.mask); *size = round_to_powerof2(mo->codemask.mask);
@ -479,7 +480,7 @@ UINT16 *atarimo_get_code_lookup(int map, int *size)
UINT8 *atarimo_get_color_lookup(int map, int *size) UINT8 *atarimo_get_color_lookup(int map, int *size)
{ {
struct atarimo_data *mo = &atarimo[map]; atarimo_data *mo = &atarimo[map];
if (size) if (size)
*size = round_to_powerof2(mo->colormask.mask); *size = round_to_powerof2(mo->colormask.mask);
@ -494,9 +495,9 @@ UINT8 *atarimo_get_color_lookup(int map, int *size)
UINT8 *atarimo_get_gfx_lookup(int map, int *size) UINT8 *atarimo_get_gfx_lookup(int map, int *size)
{ {
struct atarimo_data *mo = &atarimo[map]; atarimo_data *mo = &atarimo[map];
mo->gfxchanged = 1; mo->gfxchanged = TRUE;
if (size) if (size)
*size = round_to_powerof2(mo->gfxmask.mask); *size = round_to_powerof2(mo->gfxmask.mask);
return mo->gfxlookup; return mo->gfxlookup;
@ -504,26 +505,23 @@ UINT8 *atarimo_get_gfx_lookup(int map, int *size)
/*--------------------------------------------------------------- /*---------------------------------------------------------------
update_active_list: Update the list of active objects. build_active_list: Build a list of active objects.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
static void update_active_list(struct atarimo_data *mo, int link) static void build_active_list(atarimo_data *mo, int link)
{ {
struct atarimo_entry *bankbase = &mo->spriteram[mo->bank << mo->entrybits]; atarimo_entry *bankbase = &mo->spriteram[mo->bank << mo->entrybits];
UINT8 movisit[ATARIMO_MAXPERBANK]; UINT8 movisit[ATARIMO_MAXPERBANK];
struct atarimo_entry **current; atarimo_entry **current;
int i; int i;
/* reset the visit map */ /* reset the visit map */
memset(movisit, 0, mo->entrycount); memset(movisit, 0, mo->entrycount);
/* remember the last link */
mo->last_link = link;
/* visit all the motion objects and copy their data into the display list */ /* visit all the motion objects and copy their data into the display list */
for (i = 0, current = mo->activelist; i < mo->maxperline && !movisit[link]; i++) for (i = 0, current = mo->activelist; i < mo->maxperline && !movisit[link]; i++)
{ {
struct atarimo_entry *modata = &bankbase[link]; atarimo_entry *modata = &bankbase[link];
/* copy the current entry into the list */ /* copy the current entry into the list */
*current++ = modata; *current++ = modata;
@ -546,7 +544,7 @@ static void update_active_list(struct atarimo_data *mo, int link)
X and Y position. X and Y position.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
INLINE UINT8 *get_dirty_base(struct atarimo_data *mo, int x, int y) INLINE UINT8 *get_dirty_base(atarimo_data *mo, int x, int y)
{ {
UINT8 *result = mo->dirtygrid; UINT8 *result = mo->dirtygrid;
result += ((y >> mo->tileyshift) + 1) * mo->dirtywidth; result += ((y >> mo->tileyshift) + 1) * mo->dirtywidth;
@ -560,7 +558,7 @@ INLINE UINT8 *get_dirty_base(struct atarimo_data *mo, int x, int y)
cliprect. cliprect.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
static void erase_dirty_grid(struct atarimo_data *mo, const rectangle *cliprect) static void erase_dirty_grid(atarimo_data *mo, const rectangle *cliprect)
{ {
int sx = cliprect->min_x >> mo->tilexshift; int sx = cliprect->min_x >> mo->tilexshift;
int ex = cliprect->max_x >> mo->tilexshift; int ex = cliprect->max_x >> mo->tilexshift;
@ -583,7 +581,7 @@ static void erase_dirty_grid(struct atarimo_data *mo, const rectangle *cliprect)
series of cliprects. series of cliprects.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
static void convert_dirty_grid_to_rects(struct atarimo_data *mo, const rectangle *cliprect, struct atarimo_rect_list *rectlist) static void convert_dirty_grid_to_rects(atarimo_data *mo, const rectangle *cliprect, atarimo_rect_list *rectlist)
{ {
int sx = cliprect->min_x >> mo->tilexshift; int sx = cliprect->min_x >> mo->tilexshift;
int ex = cliprect->max_x >> mo->tilexshift; int ex = cliprect->max_x >> mo->tilexshift;
@ -646,18 +644,18 @@ static void convert_dirty_grid_to_rects(struct atarimo_data *mo, const rectangle
destination bitmap. destination bitmap.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
bitmap_t *atarimo_render(running_machine *machine, int map, const rectangle *cliprect, struct atarimo_rect_list *rectlist) bitmap_t *atarimo_render(int map, const rectangle *cliprect, atarimo_rect_list *rectlist)
{ {
struct atarimo_data *mo = &atarimo[map]; atarimo_data *mo = &atarimo[map];
int startband, stopband, band, i; int startband, stopband, band, i;
rectangle *rect; rectangle *rect;
/* if the graphics info has changed, recompute */ /* if the graphics info has changed, recompute */
if (mo->gfxchanged) if (mo->gfxchanged)
{ {
mo->gfxchanged = 0; mo->gfxchanged = FALSE;
for (i = 0; i < round_to_powerof2(mo->gfxmask.mask); i++) for (i = 0; i < round_to_powerof2(mo->gfxmask.mask); i++)
init_gfxelement(machine, mo, mo->gfxlookup[i]); init_gfxelement(mo, mo->gfxlookup[i]);
} }
/* compute start/stop bands */ /* compute start/stop bands */
@ -674,7 +672,7 @@ bitmap_t *atarimo_render(running_machine *machine, int map, const rectangle *cli
/* loop over SLIP bands */ /* loop over SLIP bands */
for (band = startband; band <= stopband; band++) for (band = startband; band <= stopband; band++)
{ {
struct atarimo_entry **first, **current, **last; atarimo_entry **first, **current, **last;
rectangle bandclip; rectangle bandclip;
int link, step; int link, step;
@ -696,7 +694,7 @@ bitmap_t *atarimo_render(running_machine *machine, int map, const rectangle *cli
/* compute minimum Y and wrap around if necessary */ /* compute minimum Y and wrap around if necessary */
bandclip.min_y = ((band << mo->slipshift) - mo->yscroll + mo->slipoffset) & mo->bitmapymask; bandclip.min_y = ((band << mo->slipshift) - mo->yscroll + mo->slipoffset) & mo->bitmapymask;
if (bandclip.min_y > video_screen_get_visible_area(machine->primary_screen)->max_y) if (bandclip.min_y > video_screen_get_visible_area(mo->machine->primary_screen)->max_y)
bandclip.min_y -= mo->bitmapheight; bandclip.min_y -= mo->bitmapheight;
/* maximum Y is based on the minimum */ /* maximum Y is based on the minimum */
@ -707,8 +705,7 @@ bitmap_t *atarimo_render(running_machine *machine, int map, const rectangle *cli
} }
/* if this matches the last link, we don't need to re-process the list */ /* if this matches the last link, we don't need to re-process the list */
if (link != mo->last_link) build_active_list(mo, link);
update_active_list(mo, link);
/* set the start and end points */ /* set the start and end points */
if (mo->reverse) if (mo->reverse)
@ -729,7 +726,7 @@ bitmap_t *atarimo_render(running_machine *machine, int map, const rectangle *cli
/* render the mos */ /* render the mos */
for (current = first; current != last; current += step) for (current = first; current != last; current += step)
mo_render_object(machine, mo, *current, &bandclip); mo_render_object(mo, *current, &bandclip);
} }
/* convert the dirty grid to a rectlist */ /* convert the dirty grid to a rectlist */
@ -750,7 +747,7 @@ bitmap_t *atarimo_render(running_machine *machine, int map, const rectangle *cli
to the destination. to the destination.
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
static int mo_render_object(running_machine *machine, struct atarimo_data *mo, const struct atarimo_entry *entry, const rectangle *cliprect) static int mo_render_object(atarimo_data *mo, const atarimo_entry *entry, const rectangle *cliprect)
{ {
int gfxindex = mo->gfxlookup[EXTRACT_DATA(entry, mo->gfxmask)]; int gfxindex = mo->gfxlookup[EXTRACT_DATA(entry, mo->gfxmask)];
const gfx_element *gfx = &mo->gfxelement[gfxindex]; const gfx_element *gfx = &mo->gfxelement[gfxindex];
@ -815,8 +812,8 @@ if ((temp & 0xff00) == 0xc800)
/* adjust the final coordinates */ /* adjust the final coordinates */
xpos &= mo->bitmapxmask; xpos &= mo->bitmapxmask;
ypos &= mo->bitmapymask; ypos &= mo->bitmapymask;
if (xpos > video_screen_get_visible_area(machine->primary_screen)->max_x) xpos -= mo->bitmapwidth; if (xpos > video_screen_get_visible_area(mo->machine->primary_screen)->max_x) xpos -= mo->bitmapwidth;
if (ypos > video_screen_get_visible_area(machine->primary_screen)->max_y) ypos -= mo->bitmapheight; if (ypos > video_screen_get_visible_area(mo->machine->primary_screen)->max_y) ypos -= mo->bitmapheight;
/* is this one special? */ /* is this one special? */
if (mo->specialmask.mask != 0 && EXTRACT_DATA(entry, mo->specialmask) == mo->specialvalue) if (mo->specialmask.mask != 0 && EXTRACT_DATA(entry, mo->specialmask) == mo->specialvalue)
@ -926,12 +923,8 @@ if ((temp & 0xff00) == 0xc800)
void atarimo_set_bank(int map, int bank) void atarimo_set_bank(int map, int bank)
{ {
struct atarimo_data *mo = &atarimo[map]; atarimo_data *mo = &atarimo[map];
if (mo->bank != bank) mo->bank = bank;
{
mo->bank = bank;
mo->last_link = -1;
}
} }
@ -942,7 +935,7 @@ void atarimo_set_bank(int map, int bank)
void atarimo_set_xscroll(int map, int xscroll) void atarimo_set_xscroll(int map, int xscroll)
{ {
struct atarimo_data *mo = &atarimo[map]; atarimo_data *mo = &atarimo[map];
mo->xscroll = xscroll; mo->xscroll = xscroll;
} }
@ -954,7 +947,7 @@ void atarimo_set_xscroll(int map, int xscroll)
void atarimo_set_yscroll(int map, int yscroll) void atarimo_set_yscroll(int map, int yscroll)
{ {
struct atarimo_data *mo = &atarimo[map]; atarimo_data *mo = &atarimo[map];
mo->yscroll = yscroll; mo->yscroll = yscroll;
} }
@ -1013,7 +1006,6 @@ WRITE16_HANDLER( atarimo_0_spriteram_w )
} }
bank = offset >> (2 + atarimo[0].entrybits); bank = offset >> (2 + atarimo[0].entrybits);
COMBINE_DATA(&atarimo[0].spriteram[(bank << atarimo[0].entrybits) + entry].data[idx]); COMBINE_DATA(&atarimo[0].spriteram[(bank << atarimo[0].entrybits) + entry].data[idx]);
atarimo[0].last_link = -1;
} }
@ -1038,7 +1030,6 @@ WRITE16_HANDLER( atarimo_1_spriteram_w )
} }
bank = offset >> (2 + atarimo[1].entrybits); bank = offset >> (2 + atarimo[1].entrybits);
COMBINE_DATA(&atarimo[1].spriteram[(bank << atarimo[1].entrybits) + entry].data[idx]); COMBINE_DATA(&atarimo[1].spriteram[(bank << atarimo[1].entrybits) + entry].data[idx]);
atarimo[1].last_link = -1;
} }
@ -1067,7 +1058,6 @@ WRITE16_HANDLER( atarimo_0_spriteram_expanded_w )
} }
bank = offset >> (2 + atarimo[0].entrybits); bank = offset >> (2 + atarimo[0].entrybits);
COMBINE_DATA(&atarimo[0].spriteram[(bank << atarimo[0].entrybits) + entry].data[idx]); COMBINE_DATA(&atarimo[0].spriteram[(bank << atarimo[0].entrybits) + entry].data[idx]);
atarimo[0].last_link = -1;
} }
} }

69
src/mame/video/atarimo.h
View File

@ -1,18 +1,18 @@
/*########################################################################## /***************************************************************************
atarimo.h atarimo.h
Common motion object management functions for Atari raster games. Common motion object management functions for Atari raster games.
##########################################################################*/ ***************************************************************************/
#ifndef __ATARIMO__ #ifndef __ATARIMO__
#define __ATARIMO__ #define __ATARIMO__
/*########################################################################## /***************************************************************************
CONSTANTS CONSTANTS
##########################################################################*/ ***************************************************************************/
/* maximum number of motion object processors */ /* maximum number of motion object processors */
#define ATARIMO_MAX 2 #define ATARIMO_MAX 2
@ -27,21 +27,23 @@
/*########################################################################## /***************************************************************************
TYPES & STRUCTURES TYPES & STRUCTURES
##########################################################################*/ ***************************************************************************/
/* callback for special processing */ /* callback for special processing */
typedef int (*atarimo_special_func)(bitmap_t *bitmap, const rectangle *clip, int code, int color, int xpos, int ypos, rectangle *mobounds); typedef int (*atarimo_special_func)(bitmap_t *bitmap, const rectangle *clip, int code, int color, int xpos, int ypos, rectangle *mobounds);
/* description for a four-word mask */ /* description for a four-word mask */
struct atarimo_entry typedef struct _atarimo_entry atarimo_entry;
struct _atarimo_entry
{ {
UINT16 data[4]; UINT16 data[4];
}; };
/* description of the motion objects */ /* description of the motion objects */
struct atarimo_desc typedef struct _atarimo_desc atarimo_desc;
struct _atarimo_desc
{ {
UINT8 gfxindex; /* index to which gfx system */ UINT8 gfxindex; /* index to which gfx system */
UINT8 banks; /* number of motion object banks */ UINT8 banks; /* number of motion object banks */
@ -58,46 +60,47 @@ struct atarimo_desc
UINT16 maxcolors; /* maximum number of colors */ UINT16 maxcolors; /* maximum number of colors */
UINT8 transpen; /* transparent pen index */ UINT8 transpen; /* transparent pen index */
struct atarimo_entry linkmask; /* mask for the link */ atarimo_entry linkmask; /* mask for the link */
struct atarimo_entry gfxmask; /* mask for the graphics bank */ atarimo_entry gfxmask; /* mask for the graphics bank */
struct atarimo_entry codemask; /* mask for the code index */ atarimo_entry codemask; /* mask for the code index */
struct atarimo_entry codehighmask; /* mask for the upper code index */ atarimo_entry codehighmask; /* mask for the upper code index */
struct atarimo_entry colormask; /* mask for the color */ atarimo_entry colormask; /* mask for the color */
struct atarimo_entry xposmask; /* mask for the X position */ atarimo_entry xposmask; /* mask for the X position */
struct atarimo_entry yposmask; /* mask for the Y position */ atarimo_entry yposmask; /* mask for the Y position */
struct atarimo_entry widthmask; /* mask for the width, in tiles*/ atarimo_entry widthmask; /* mask for the width, in tiles*/
struct atarimo_entry heightmask; /* mask for the height, in tiles */ atarimo_entry heightmask; /* mask for the height, in tiles */
struct atarimo_entry hflipmask; /* mask for the horizontal flip */ atarimo_entry hflipmask; /* mask for the horizontal flip */
struct atarimo_entry vflipmask; /* mask for the vertical flip */ atarimo_entry vflipmask; /* mask for the vertical flip */
struct atarimo_entry prioritymask; /* mask for the priority */ atarimo_entry prioritymask; /* mask for the priority */
struct atarimo_entry neighbormask; /* mask for the neighbor */ atarimo_entry neighbormask; /* mask for the neighbor */
struct atarimo_entry absolutemask; /* mask for absolute coordinates */ atarimo_entry absolutemask; /* mask for absolute coordinates */
struct atarimo_entry specialmask; /* mask for the special value */ atarimo_entry specialmask; /* mask for the special value */
UINT16 specialvalue; /* resulting value to indicate "special" */ UINT16 specialvalue; /* resulting value to indicate "special" */
atarimo_special_func specialcb; /* callback routine for special entries */ atarimo_special_func specialcb; /* callback routine for special entries */
}; };
/* rectangle list */ /* rectangle list */
struct atarimo_rect_list typedef struct _atarimo_rect_list atarimo_rect_list;
struct _atarimo_rect_list
{ {
int numrects; int numrects;
rectangle * rect; rectangle * rect;
}; };
/*########################################################################## /***************************************************************************
FUNCTION PROTOTYPES FUNCTION PROTOTYPES
##########################################################################*/ ***************************************************************************/
/* setup/shutdown */ /* setup/shutdown */
void atarimo_init(running_machine *machine, int map, const struct atarimo_desc *desc); void atarimo_init(running_machine *machine, int map, const atarimo_desc *desc);
UINT16 *atarimo_get_code_lookup(int map, int *size); UINT16 *atarimo_get_code_lookup(int map, int *size);
UINT8 *atarimo_get_color_lookup(int map, int *size); UINT8 *atarimo_get_color_lookup(int map, int *size);
UINT8 *atarimo_get_gfx_lookup(int map, int *size); UINT8 *atarimo_get_gfx_lookup(int map, int *size);
/* core processing */ /* core processing */
bitmap_t *atarimo_render(running_machine *machine, int map, const rectangle *cliprect, struct atarimo_rect_list *rectlist); bitmap_t *atarimo_render(int map, const rectangle *cliprect, atarimo_rect_list *rectlist);
/* atrribute setters */ /* atrribute setters */
void atarimo_set_bank(int map, int bank); void atarimo_set_bank(int map, int bank);
@ -119,9 +122,9 @@ WRITE16_HANDLER( atarimo_1_slipram_w );
/*########################################################################## /***************************************************************************
GLOBAL VARIABLES GLOBAL VARIABLES
##########################################################################*/ ***************************************************************************/
extern UINT16 *atarimo_0_spriteram; extern UINT16 *atarimo_0_spriteram;
extern UINT16 *atarimo_0_slipram; extern UINT16 *atarimo_0_slipram;

6
src/mame/video/atarisy1.c
View File

@ -151,7 +151,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( atarisy1 ) VIDEO_START( atarisy1 )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
8, /* number of motion object banks */ 8, /* number of motion object banks */
@ -514,7 +514,7 @@ static void update_timers(running_machine *machine, int scanline)
VIDEO_UPDATE( atarisy1 ) VIDEO_UPDATE( atarisy1 )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -522,7 +522,7 @@ VIDEO_UPDATE( atarisy1 )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/atarisy2.c
View File

@ -79,7 +79,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( atarisy2 ) VIDEO_START( atarisy2 )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -330,7 +330,7 @@ WRITE16_HANDLER( atarisy2_videoram_w )
VIDEO_UPDATE( atarisy2 ) VIDEO_UPDATE( atarisy2 )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -342,7 +342,7 @@ VIDEO_UPDATE( atarisy2 )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 3, 3); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 3, 3);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/badlands.c
View File

@ -44,7 +44,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( badlands ) VIDEO_START( badlands )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -117,7 +117,7 @@ WRITE16_HANDLER( badlands_pf_bank_w )
VIDEO_UPDATE( badlands ) VIDEO_UPDATE( badlands )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -125,7 +125,7 @@ VIDEO_UPDATE( badlands )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/batman.c
View File

@ -68,7 +68,7 @@ static TILE_GET_INFO( get_playfield2_tile_info )
VIDEO_START( batman ) VIDEO_START( batman )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -201,7 +201,7 @@ void batman_scanline_update(const device_config *screen, int scanline)
VIDEO_UPDATE( batman ) VIDEO_UPDATE( batman )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -217,7 +217,7 @@ VIDEO_UPDATE( batman )
tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 3, 0x8c); tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 3, 0x8c);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/blstroid.c
View File

@ -44,7 +44,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( blstroid ) VIDEO_START( blstroid )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -150,7 +150,7 @@ void blstroid_scanline_update(const device_config *screen, int scanline)
VIDEO_UPDATE( blstroid ) VIDEO_UPDATE( blstroid )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -158,7 +158,7 @@ VIDEO_UPDATE( blstroid )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

8
src/mame/video/cyberbal.c
View File

@ -88,7 +88,7 @@ static TILE_GET_INFO( get_playfield2_tile_info )
static void video_start_cyberbal_common(running_machine* machine, int screens) static void video_start_cyberbal_common(running_machine* machine, int screens)
{ {
static const struct atarimo_desc mo0desc = static const atarimo_desc mo0desc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -125,7 +125,7 @@ static void video_start_cyberbal_common(running_machine* machine, int screens)
0 /* callback routine for special entries */ 0 /* callback routine for special entries */
}; };
static const struct atarimo_desc mo1desc = static const atarimo_desc mo1desc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -347,7 +347,7 @@ void cyberbal_scanline_update(const device_config *screen, int scanline)
static void update_one_screen(const device_config *screen, bitmap_t *bitmap, const rectangle *cliprect) static void update_one_screen(const device_config *screen, bitmap_t *bitmap, const rectangle *cliprect)
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
rectangle tempclip = *cliprect; rectangle tempclip = *cliprect;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r, mooffset, temp; int x, y, r, mooffset, temp;
@ -368,7 +368,7 @@ static void update_one_screen(const device_config *screen, bitmap_t *bitmap, con
temp = visarea->max_x; temp = visarea->max_x;
if (temp > SCREEN_WIDTH) if (temp > SCREEN_WIDTH)
visarea->max_x /= 2; visarea->max_x /= 2;
mobitmap = atarimo_render(screen->machine, (screen == left_screen) ? 0 : 1, cliprect, &rectlist); mobitmap = atarimo_render((screen == left_screen) ? 0 : 1, cliprect, &rectlist);
tempclip.min_x += mooffset; tempclip.min_x += mooffset;
tempclip.max_x += mooffset; tempclip.max_x += mooffset;
visarea->max_x = temp; visarea->max_x = temp;

12
src/mame/video/eprom.c
View File

@ -56,7 +56,7 @@ static TILE_GET_INFO( guts_get_playfield_tile_info )
VIDEO_START( eprom ) VIDEO_START( eprom )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -107,7 +107,7 @@ VIDEO_START( eprom )
VIDEO_START( guts ) VIDEO_START( guts )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -187,7 +187,7 @@ void eprom_scanline_update(const device_config *screen, int scanline)
VIDEO_UPDATE( eprom ) VIDEO_UPDATE( eprom )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -195,7 +195,7 @@ VIDEO_UPDATE( eprom )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {
@ -333,7 +333,7 @@ VIDEO_UPDATE( eprom )
VIDEO_UPDATE( guts ) VIDEO_UPDATE( guts )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -341,7 +341,7 @@ VIDEO_UPDATE( guts )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/gauntlet.c
View File

@ -65,7 +65,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( gauntlet ) VIDEO_START( gauntlet )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -189,7 +189,7 @@ WRITE16_HANDLER( gauntlet_yscroll_w )
VIDEO_UPDATE( gauntlet ) VIDEO_UPDATE( gauntlet )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -197,7 +197,7 @@ VIDEO_UPDATE( gauntlet )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/klax.c
View File

@ -35,7 +35,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( klax ) VIDEO_START( klax )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -101,7 +101,7 @@ WRITE16_HANDLER( klax_latch_w )
VIDEO_UPDATE( klax ) VIDEO_UPDATE( klax )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -109,7 +109,7 @@ VIDEO_UPDATE( klax )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/offtwall.c
View File

@ -35,7 +35,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( offtwall ) VIDEO_START( offtwall )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -89,7 +89,7 @@ VIDEO_START( offtwall )
VIDEO_UPDATE( offtwall ) VIDEO_UPDATE( offtwall )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -97,7 +97,7 @@ VIDEO_UPDATE( offtwall )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/rampart.c
View File

@ -28,7 +28,7 @@ UINT16 *rampart_bitmap;
VIDEO_START( rampart ) VIDEO_START( rampart )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -82,7 +82,7 @@ VIDEO_START( rampart )
VIDEO_UPDATE( rampart ) VIDEO_UPDATE( rampart )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -90,7 +90,7 @@ VIDEO_UPDATE( rampart )
rampart_bitmap_render(screen->machine, bitmap, cliprect); rampart_bitmap_render(screen->machine, bitmap, cliprect);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/relief.c
View File

@ -45,7 +45,7 @@ static TILE_GET_INFO( get_playfield2_tile_info )
VIDEO_START( relief ) VIDEO_START( relief )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -106,7 +106,7 @@ VIDEO_START( relief )
VIDEO_UPDATE( relief ) VIDEO_UPDATE( relief )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -116,7 +116,7 @@ VIDEO_UPDATE( relief )
tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 0, 1); tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 0, 1);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/shuuz.c
View File

@ -35,7 +35,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( shuuz ) VIDEO_START( shuuz )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -89,7 +89,7 @@ VIDEO_START( shuuz )
VIDEO_UPDATE( shuuz ) VIDEO_UPDATE( shuuz )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -97,7 +97,7 @@ VIDEO_UPDATE( shuuz )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/skullxbo.c
View File

@ -46,7 +46,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( skullxbo ) VIDEO_START( skullxbo )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
2, /* number of motion object banks */ 2, /* number of motion object banks */
@ -236,7 +236,7 @@ void skullxbo_scanline_update(int scanline)
VIDEO_UPDATE( skullxbo ) VIDEO_UPDATE( skullxbo )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -244,7 +244,7 @@ VIDEO_UPDATE( skullxbo )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/thunderj.c
View File

@ -67,7 +67,7 @@ static TILE_GET_INFO( get_playfield2_tile_info )
VIDEO_START( thunderj ) VIDEO_START( thunderj )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -154,7 +154,7 @@ void thunderj_mark_high_palette(bitmap_t *bitmap, UINT16 *pf, UINT16 *mo, int x,
VIDEO_UPDATE( thunderj ) VIDEO_UPDATE( thunderj )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -170,7 +170,7 @@ VIDEO_UPDATE( thunderj )
tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 3, 0x8c); tilemap_draw(bitmap, cliprect, atarigen_playfield2_tilemap, 3, 0x8c);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/toobin.c
View File

@ -55,7 +55,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( toobin ) VIDEO_START( toobin )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -227,7 +227,7 @@ WRITE16_HANDLER( toobin_slip_w )
VIDEO_UPDATE( toobin ) VIDEO_UPDATE( toobin )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -239,7 +239,7 @@ VIDEO_UPDATE( toobin )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 3, 3); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 3, 3);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/vindictr.c
View File

@ -57,7 +57,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( vindictr ) VIDEO_START( vindictr )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
0, /* index to which gfx system */ 0, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -224,7 +224,7 @@ void vindictr_scanline_update(const device_config *screen, int scanline)
VIDEO_UPDATE( vindictr ) VIDEO_UPDATE( vindictr )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -232,7 +232,7 @@ VIDEO_UPDATE( vindictr )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {

6
src/mame/video/xybots.c
View File

@ -44,7 +44,7 @@ static TILE_GET_INFO( get_playfield_tile_info )
VIDEO_START( xybots ) VIDEO_START( xybots )
{ {
static const struct atarimo_desc modesc = static const atarimo_desc modesc =
{ {
1, /* index to which gfx system */ 1, /* index to which gfx system */
1, /* number of motion object banks */ 1, /* number of motion object banks */
@ -102,7 +102,7 @@ VIDEO_START( xybots )
VIDEO_UPDATE( xybots ) VIDEO_UPDATE( xybots )
{ {
struct atarimo_rect_list rectlist; atarimo_rect_list rectlist;
bitmap_t *mobitmap; bitmap_t *mobitmap;
int x, y, r; int x, y, r;
@ -110,7 +110,7 @@ VIDEO_UPDATE( xybots )
tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, atarigen_playfield_tilemap, 0, 0);
/* draw and merge the MO */ /* draw and merge the MO */
mobitmap = atarimo_render(screen->machine, 0, cliprect, &rectlist); mobitmap = atarimo_render(0, cliprect, &rectlist);
for (r = 0; r < rectlist.numrects; r++, rectlist.rect++) for (r = 0; r < rectlist.numrects; r++, rectlist.rect++)
for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++) for (y = rectlist.rect->min_y; y <= rectlist.rect->max_y; y++)
{ {