diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index 45a07910ffd..bca8f126aca 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -149,7 +149,7 @@ struct _z80dma_t UINT8 read_regs_follow[7]; UINT8 status; UINT8 dma_enabled; - + UINT16 addressA; UINT16 addressB; UINT16 count; @@ -378,14 +378,14 @@ static TIMER_CALLBACK( z80dma_timerproc ) { z80dma->dma_enabled = 0; //FIXME: Correct? z80dma->status = 0x19; - + if(!(z80dma->rdy ^ READY_ACTIVE_HIGH(z80dma))) z80dma->status |= 0x02; // ready line status - + if(TRANSFER_MODE(z80dma) == TM_TRANSFER) z80dma->status |= 0x10; // no match found - + z80dma_update_status(device); if (LOG) logerror("Z80DMA '%s' End of Block\n", device->tag.cstr()); - + if (INT_ON_END_OF_BLOCK(z80dma)) { trigger_interrupt(device, INT_END_OF_BLOCK); @@ -721,14 +721,14 @@ static int z80dma_irq_ack(running_device *device) if (z80dma->ip) { if (LOG) logerror("Z80DMA '%s' Interrupt Acknowledge\n", device->tag.cstr()); - + /* clear interrupt pending flag */ z80dma->ip = 0; interrupt_check(z80dma); /* set interrupt under service flag */ z80dma->ius = 1; - + /* disable DMA */ z80dma->dma_enabled = 0; diff --git a/src/emu/machine/z80pio.c b/src/emu/machine/z80pio.c index 511f361db50..c915691ebc3 100644 --- a/src/emu/machine/z80pio.c +++ b/src/emu/machine/z80pio.c @@ -4,7 +4,7 @@ Copyright Nicola Salmoria and the MAME Team. Visit http://mamedev.org for licensing and usage restrictions. - + ***************************************************************************/ #include "emu.h" @@ -106,7 +106,7 @@ static void check_interrupts(running_device *device) z80pio_t *z80pio = get_safe_token(device); int state = CLEAR_LINE; - + for (int index = PORT_A; index < PORT_COUNT; index++) { pio_port *port = &z80pio->port[index]; @@ -333,7 +333,7 @@ WRITE8_DEVICE_HANDLER( z80pio_c_w ) case MASK: /* interrupt mask */ port->mask = data; if (LOG) logerror("Z80PIO '%s' Port %c Mask: %02x\n", device->tag.cstr(), 'A' + index, data); - + /* set interrupt enable */ port->ie = BIT(port->icw, 7); check_interrupts(device); @@ -509,7 +509,7 @@ READ8_DEVICE_HANDLER( z80pio_pa_r ) { z80pio_t *z80pio = get_safe_token(device); pio_port *port = &z80pio->port[PORT_A]; - + UINT8 data = 0xff; switch (port->mode) @@ -538,7 +538,7 @@ WRITE8_DEVICE_HANDLER( z80pio_pa_w ) { z80pio_t *z80pio = get_safe_token(device); pio_port *port = &z80pio->port[PORT_A]; - + if (port->mode == MODE_BIT_CONTROL) { /* latch data */ @@ -555,7 +555,7 @@ READ8_DEVICE_HANDLER( z80pio_pb_r ) { z80pio_t *z80pio = get_safe_token(device); pio_port *port = &z80pio->port[PORT_B]; - + UINT8 data = 0xff; switch (port->mode) @@ -580,7 +580,7 @@ WRITE8_DEVICE_HANDLER( z80pio_pb_w ) { z80pio_t *z80pio = get_safe_token(device); pio_port *port = &z80pio->port[PORT_B]; - + if (port->mode == MODE_BIT_CONTROL) { /* latch data */ @@ -616,7 +616,7 @@ static void strobe(running_device *device, int index, int state) else if (!port->stb && state) /* rising edge */ { trigger_interrupt(device, index); - + /* clear ready line */ set_rdy(device, index, 0); } @@ -705,7 +705,7 @@ static int z80pio_irq_state(running_device *device) z80pio_t *z80pio = get_safe_token(device); int state = 0; - + for (int index = PORT_A; index < PORT_COUNT; index++) { pio_port *port = &z80pio->port[index]; diff --git a/src/emu/machine/z80pio.h b/src/emu/machine/z80pio.h index 9c4cc047698..f19534644a6 100644 --- a/src/emu/machine/z80pio.h +++ b/src/emu/machine/z80pio.h @@ -17,7 +17,7 @@ PA6 8 | | 33 PB6 PA5 9 | | 32 PB5 PA4 10 | Z8420 | 31 PB4 - GND 11 | | 30 PB3 + GND 11 | | 30 PB3 PA3 12 | | 29 PB2 PA2 13 | | 28 PB1 PA1 14 | | 27 PB0 diff --git a/src/emu/sound/mos6560.c b/src/emu/sound/mos6560.c index 2a1599a3683..86774e83108 100644 --- a/src/emu/sound/mos6560.c +++ b/src/emu/sound/mos6560.c @@ -506,7 +506,7 @@ void mos6560_raster_interrupt_gen( running_device *device ) /*------------------------------------------------- - mos6560_video_update - copy the VIC bitmap to + mos6560_video_update - copy the VIC bitmap to main screen bitmap -------------------------------------------------*/ diff --git a/src/emu/sound/sn76496.c b/src/emu/sound/sn76496.c index ed4aab4cee6..729c79b7a89 100644 --- a/src/emu/sound/sn76496.c +++ b/src/emu/sound/sn76496.c @@ -88,7 +88,7 @@ Thanks to PlgDavid for providing samples which helped immensely here. Added true clock divider emulation, so sn94624 and sn76494 run 8x faster than the others, as in real life. - + 15/02/2010: Lord Nightmare & Michael Zapf (additional testing by PlgDavid) Fix noise period when set to mirror channel 3 and channel 3 period is set to 0 (tested on hardware for noise, wave needs tests) - MZ Fix phase of noise on sn94624 and sn76489; all chips use a standard XOR, the only inversion is the output itself - LN, Plgdavid diff --git a/src/mame/drivers/1945kiii.c b/src/mame/drivers/1945kiii.c index 52a1a82a774..577a36275e6 100644 --- a/src/mame/drivers/1945kiii.c +++ b/src/mame/drivers/1945kiii.c @@ -53,7 +53,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, k3_state(machine)); } k3_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram_1; UINT16 * spriteram_2; diff --git a/src/mame/drivers/ace.c b/src/mame/drivers/ace.c index 1ad7fa61613..d2576c5d673 100644 --- a/src/mame/drivers/ace.c +++ b/src/mame/drivers/ace.c @@ -49,7 +49,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ace_state(machine)); } ace_state(running_machine &machine) { } - + /* video-related */ UINT8 * ram2; UINT8 * scoreram; diff --git a/src/mame/drivers/adp.c b/src/mame/drivers/adp.c index d1efdff794e..a64e5d1168d 100644 --- a/src/mame/drivers/adp.c +++ b/src/mame/drivers/adp.c @@ -158,7 +158,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, adp_state(machine)); } adp_state(running_machine &machine) { } - + /* misc */ UINT8 mux_data; UINT8 register_active; diff --git a/src/mame/drivers/albazc.c b/src/mame/drivers/albazc.c index 72c0a90fbe8..b65a79ed531 100644 --- a/src/mame/drivers/albazc.c +++ b/src/mame/drivers/albazc.c @@ -20,7 +20,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, albazc_state(machine)); } albazc_state(running_machine &machine) { } - + /* video-related */ UINT8 * spriteram1; UINT8 * spriteram2; diff --git a/src/mame/drivers/albazg.c b/src/mame/drivers/albazg.c index 5cd45a4547d..54d4c865926 100644 --- a/src/mame/drivers/albazg.c +++ b/src/mame/drivers/albazg.c @@ -67,7 +67,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, albazg_state(machine)); } albazg_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * cus_ram; UINT8 * videoram; diff --git a/src/mame/drivers/astinvad.c b/src/mame/drivers/astinvad.c index 603c2ffa113..471a543d63d 100644 --- a/src/mame/drivers/astinvad.c +++ b/src/mame/drivers/astinvad.c @@ -47,7 +47,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astinvad_state(machine)); } astinvad_state(running_machine &machine) { } - + UINT8 * colorram; UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/drivers/astrocorp.c b/src/mame/drivers/astrocorp.c index 199948be014..5dfb3046ee3 100644 --- a/src/mame/drivers/astrocorp.c +++ b/src/mame/drivers/astrocorp.c @@ -30,7 +30,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astrocorp_state(machine)); } astrocorp_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; UINT16 * paletteram; diff --git a/src/mame/drivers/attckufo.c b/src/mame/drivers/attckufo.c index 208d51639bd..350e291110a 100644 --- a/src/mame/drivers/attckufo.c +++ b/src/mame/drivers/attckufo.c @@ -52,7 +52,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, attckufo_state(machine)); } attckufo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * mainram; UINT8 * tileram; diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index 5acf9c4199f..128605f1e47 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -90,7 +90,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = spriteram[offs] & 0xffff; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2] & 0xffff; @@ -98,7 +98,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect pri = (x & 0xc000); // 2 bits or 1? - switch (pri & 0xc000) + switch (pri & 0xc000) { case 0x0000: pri = 0; break; // numbers, people, cars when in the air, status display.. case 0x4000: pri = 0xf0;break; // cars most of the time @@ -244,7 +244,7 @@ static READ32_HANDLER(backfire_control3_r) static WRITE32_DEVICE_HANDLER(backfire_eeprom_w) { logerror("%s:write eprom %08x (%08x) %08x\n",cpuexec_describe_context(device->machine),offset<<1,mem_mask,data); - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) { eeprom_set_clock_line(device, BIT(data, 1) ? ASSERT_LINE : CLEAR_LINE); eeprom_write_bit(device, BIT(data, 0)); diff --git a/src/mame/drivers/beaminv.c b/src/mame/drivers/beaminv.c index 20782187596..7e13b22d323 100644 --- a/src/mame/drivers/beaminv.c +++ b/src/mame/drivers/beaminv.c @@ -61,7 +61,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, beaminv_state(machine)); } beaminv_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c index 3d6b4e60b46..93c48efbda0 100644 --- a/src/mame/drivers/bigfghtr.c +++ b/src/mame/drivers/bigfghtr.c @@ -123,7 +123,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigfghtr_state(machine)); } bigfghtr_state(running_machine &machine) { } - + /* video-related */ UINT16 * text_videoram; UINT16 * bg_videoram; diff --git a/src/mame/drivers/boxer.c b/src/mame/drivers/boxer.c index 8999b7e8e77..fbfdf4a4ee4 100644 --- a/src/mame/drivers/boxer.c +++ b/src/mame/drivers/boxer.c @@ -26,7 +26,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, boxer_state(machine)); } boxer_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * tile_ram; UINT8 * sprite_ram; diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c index 67b323c31e7..da174cf0153 100644 --- a/src/mame/drivers/calorie.c +++ b/src/mame/drivers/calorie.c @@ -89,7 +89,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, calorie_state(machine)); } calorie_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * fg_ram; UINT8 * sprites; diff --git a/src/mame/drivers/cball.c b/src/mame/drivers/cball.c index 37815fb1481..269da881dbd 100644 --- a/src/mame/drivers/cball.c +++ b/src/mame/drivers/cball.c @@ -14,7 +14,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cball_state(machine)); } cball_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * video_ram; diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c index 232bc951409..da802c68d44 100644 --- a/src/mame/drivers/cbuster.c +++ b/src/mame/drivers/cbuster.c @@ -529,7 +529,7 @@ static DRIVER_INIT( twocrude ) int i, j; /* Main cpu decrypt */ - for (i = 0x00000; i < 0x80000; i += 2) + for (i = 0x00000; i < 0x80000; i += 2) { int h = i + NATIVE_ENDIAN_VALUE_LE_BE(1,0), l = i + NATIVE_ENDIAN_VALUE_LE_BE(0,1); @@ -543,9 +543,9 @@ static DRIVER_INIT( twocrude ) /* Rearrange the 'extra' sprite bank to be in the same format as main sprites */ RAM = memory_region(machine, "gfx3") + 0x080000; PTR = memory_region(machine, "gfx3") + 0x140000; - for (i = 0; i < 0x20000; i += 64) + for (i = 0; i < 0x20000; i += 64) { - for (j = 0; j < 16; j += 1) + for (j = 0; j < 16; j += 1) { /* Copy 16 lines down */ RAM[i + 0 + j * 2] = PTR[i / 2 + 0 + j]; /* Pixels 0-7 for each plane */ RAM[i + 1 + j * 2] = PTR[i / 2 + 0x10000 + j]; @@ -553,7 +553,7 @@ static DRIVER_INIT( twocrude ) RAM[i + 0xa0001 + j * 2] = PTR[i / 2 + 0x30000 + j]; } - for (j = 0; j < 16; j += 1) + for (j = 0; j < 16; j += 1) { /* Copy 16 lines down */ RAM[i + 0x20 + j * 2] = PTR[i / 2 + 0x10 + j]; /* Pixels 8-15 for each plane */ RAM[i + 0x21 + j * 2] = PTR[i / 2 + 0x10010 + j]; diff --git a/src/mame/drivers/chanbara.c b/src/mame/drivers/chanbara.c index cf99502fca5..05b502a7e94 100644 --- a/src/mame/drivers/chanbara.c +++ b/src/mame/drivers/chanbara.c @@ -57,7 +57,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chanbara_state(machine)); } chanbara_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c index 3f5f6c9cd89..7e46bf5149b 100644 --- a/src/mame/drivers/chinsan.c +++ b/src/mame/drivers/chinsan.c @@ -53,7 +53,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chinsan_state(machine)); } chinsan_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * video; diff --git a/src/mame/drivers/clayshoo.c b/src/mame/drivers/clayshoo.c index c2fa4d9a5fa..9d80c5861ed 100644 --- a/src/mame/drivers/clayshoo.c +++ b/src/mame/drivers/clayshoo.c @@ -23,7 +23,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, clayshoo_state(machine)); } clayshoo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c index 0c4d4fb1b11..d6260f35077 100644 --- a/src/mame/drivers/cninja.c +++ b/src/mame/drivers/cninja.c @@ -81,7 +81,7 @@ static READ16_HANDLER( cninja_irq_r ) { cninja_state *state = (cninja_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 1: /* Raster IRQ scanline position */ @@ -101,7 +101,7 @@ static WRITE16_HANDLER( cninja_irq_w ) { cninja_state *state = (cninja_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0: /* IRQ enable: @@ -131,7 +131,7 @@ static WRITE16_HANDLER( cninja_irq_w ) static READ16_HANDLER( robocop2_prot_r ) { - switch (offset << 1) + switch (offset << 1) { case 0x41a: /* Player 1 & 2 input ports */ return input_port_read(space->machine, "IN0"); @@ -754,7 +754,7 @@ static const ym2151_interface ym2151_interface2 = static int cninja_bank_callback( const int bank ) { - if ((bank >> 4) & 0xf) + if ((bank >> 4) & 0xf) return 0x0000; /* Only 2 banks */ return 0x1000; } @@ -1933,16 +1933,16 @@ static void cninja_patch( running_machine *machine ) UINT16 *RAM = (UINT16 *)memory_region(machine, "maincpu"); int i; - for (i = 0; i < 0x80000 / 2; i++) + for (i = 0; i < 0x80000 / 2; i++) { int aword = RAM[i]; - if (aword == 0x66ff || aword == 0x67ff) + if (aword == 0x66ff || aword == 0x67ff) { UINT16 doublecheck = RAM[i - 4]; /* Cmpi + btst controlling opcodes */ - if (doublecheck == 0xc39 || doublecheck == 0x839) + if (doublecheck == 0xc39 || doublecheck == 0x839) { RAM[i] = 0x4e71; RAM[i - 1] = 0x4e71; diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index 8704415ea66..4987638f24a 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -35,7 +35,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cntsteer_state(machine)); } cntsteer_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/drivers/cultures.c b/src/mame/drivers/cultures.c index 7ff011ba395..b86eeb07126 100644 --- a/src/mame/drivers/cultures.c +++ b/src/mame/drivers/cultures.c @@ -20,7 +20,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cultures_state(machine)); } cultures_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bg0_videoram; UINT8 * paletteram; diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c index b7e0764999e..5c89b8974dd 100644 --- a/src/mame/drivers/dacholer.c +++ b/src/mame/drivers/dacholer.c @@ -30,7 +30,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dacholer_state(machine)); } dacholer_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgvideoram; UINT8 * fgvideoram; diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c index 6175f92a12c..68e4456989b 100644 --- a/src/mame/drivers/dassault.c +++ b/src/mame/drivers/dassault.c @@ -179,7 +179,7 @@ static WRITE16_HANDLER( dassault_sound_w ) static READ16_HANDLER( dassault_irq_r ) { dassault_state *state = (dassault_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0: cpu_set_input_line(state->maincpu, 5, CLEAR_LINE); break; case 1: cpu_set_input_line(state->subcpu, 6, CLEAR_LINE); break; diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c index 5f5ea99fea1..8c28a57d088 100644 --- a/src/mame/drivers/dblewing.c +++ b/src/mame/drivers/dblewing.c @@ -116,7 +116,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = spriteram[offs]; flash = y & 0x1000; xsize = y & 0x0800; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2]; @@ -124,7 +124,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect pri = (x & 0xc000); // 2 bits or 1? - switch (pri & 0xc000) + switch (pri & 0xc000) { case 0x0000: pri = 0; break; case 0x4000: pri = 0xf0; break; @@ -143,7 +143,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = 240 - y; x = 304 - x; - if (x > 320) + if (x > 320) continue; sprite &= ~multi; @@ -163,7 +163,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect if (fy) fy = 0; else fy = 1; mult = 16; } - else + else mult = -16; mult2 = multi + 1; @@ -691,7 +691,7 @@ static MACHINE_START( dblewing ) state_save_register_global(machine, state->boss_3_data); state_save_register_global(machine, state->boss_4_data); state_save_register_global(machine, state->boss_5_data); - state_save_register_global(machine, state->boss_5sx_data); + state_save_register_global(machine, state->boss_5sx_data); state_save_register_global(machine, state->boss_6_data); state_save_register_global(machine, state->sound_irq); } @@ -726,7 +726,7 @@ static MACHINE_RESET( dblewing ) state->boss_3_data = 0; state->boss_4_data = 0; state->boss_5_data = 0; - state->boss_5sx_data = 0; + state->boss_5sx_data = 0; state->boss_6_data = 0; state->sound_irq = 0; } diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c index f5261d0d315..5693da3e84b 100644 --- a/src/mame/drivers/ddayjlc.c +++ b/src/mame/drivers/ddayjlc.c @@ -62,7 +62,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddayjlc_state(machine)); } ddayjlc_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgram; UINT8 * mainram; diff --git a/src/mame/drivers/ddealer.c b/src/mame/drivers/ddealer.c index 268dc75871d..8d96dcd3541 100644 --- a/src/mame/drivers/ddealer.c +++ b/src/mame/drivers/ddealer.c @@ -119,7 +119,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddealer_state(machine)); } ddealer_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * mcu_shared_ram; UINT16 * work_ram; diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c index 75c846de5e1..e90016a416c 100644 --- a/src/mame/drivers/deco156.c +++ b/src/mame/drivers/deco156.c @@ -72,7 +72,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan y = spriteram[offs] & 0xffff; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2] & 0xffff; @@ -80,7 +80,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan pri = (x & 0xc000); // 2 bits or 1? - switch (pri & 0xc000) + switch (pri & 0xc000) { case 0x0000: pri = 0; break; case 0x4000: pri = 0xf0; break; @@ -99,7 +99,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap,const rectan y = 240 - y; x = 304 - x; - if (x > 320) + if (x > 320) continue; sprite &= ~multi; diff --git a/src/mame/drivers/destroyr.c b/src/mame/drivers/destroyr.c index 9c7eb031906..1a4af3aa1df 100644 --- a/src/mame/drivers/destroyr.c +++ b/src/mame/drivers/destroyr.c @@ -15,7 +15,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, destroyr_state(machine)); } destroyr_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * major_obj_ram; UINT8 * minor_obj_ram; diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index f6709dbd5fe..b15ed82a4f6 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -49,7 +49,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, discoboy_state(machine)); } discoboy_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram_1; UINT8 * ram_2; diff --git a/src/mame/drivers/diverboy.c b/src/mame/drivers/diverboy.c index adfbbe70e96..ec0a956b495 100644 --- a/src/mame/drivers/diverboy.c +++ b/src/mame/drivers/diverboy.c @@ -59,7 +59,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, diverboy_state(machine)); } diverboy_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index b07b6e4f5a3..c9dca06dfc1 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -70,7 +70,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dominob_state(machine)); } dominob_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * spriteram; UINT8 * videoram; diff --git a/src/mame/drivers/dorachan.c b/src/mame/drivers/dorachan.c index a78199d5e1a..ab111576194 100644 --- a/src/mame/drivers/dorachan.c +++ b/src/mame/drivers/dorachan.c @@ -22,7 +22,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dorachan_state(machine)); } dorachan_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/drivers/dotrikun.c b/src/mame/drivers/dotrikun.c index e362c2dbc96..c922f90c22e 100644 --- a/src/mame/drivers/dotrikun.c +++ b/src/mame/drivers/dotrikun.c @@ -30,7 +30,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dotrikun_state(machine)); } dotrikun_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/drivers/dreamwld.c b/src/mame/drivers/dreamwld.c index 6e713f1f9ce..126ad2695d2 100644 --- a/src/mame/drivers/dreamwld.c +++ b/src/mame/drivers/dreamwld.c @@ -96,7 +96,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dreamwld_state(machine)); } dreamwld_state(running_machine &machine) { } - + /* memory pointers */ UINT32 * bg_videoram; UINT32 * bg2_videoram; diff --git a/src/mame/drivers/drtomy.c b/src/mame/drivers/drtomy.c index e66f3244c2f..ed0e03320d8 100644 --- a/src/mame/drivers/drtomy.c +++ b/src/mame/drivers/drtomy.c @@ -17,7 +17,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drtomy_state(machine)); } drtomy_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; UINT16 * videoram_bg; diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c index 6beb77d8291..57b150d3312 100644 --- a/src/mame/drivers/dunhuang.c +++ b/src/mame/drivers/dunhuang.c @@ -64,7 +64,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dunhuang_state(machine)); } dunhuang_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * videoram2; diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c index 721853c7031..503632c8bec 100644 --- a/src/mame/drivers/dwarfd.c +++ b/src/mame/drivers/dwarfd.c @@ -284,7 +284,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dwarfd_state(machine)); } dwarfd_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * dw_ram; UINT8 * videobuf; diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c index 203d0536287..99e2d2a3684 100644 --- a/src/mame/drivers/dynadice.c +++ b/src/mame/drivers/dynadice.c @@ -43,7 +43,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dynadice_state(machine)); } dynadice_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; // UINT8 * nvram; // currently this uses generic nvram handling diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c index ac3f23d99a8..2616300e887 100644 --- a/src/mame/drivers/dynax.c +++ b/src/mame/drivers/dynax.c @@ -6979,7 +6979,7 @@ GAME( 1989, drgpunch, 0, sprtmtch, sprtmtch, 0, ROT0, "Dynax", GAME( 1989, sprtmtch, drgpunch, sprtmtch, sprtmtch, 0, ROT0, "Dynax (Fabtek license)", "Sports Match", 0 ) /* these 4 are Korean hacks / bootlegs of Dragon Punch / Sports Match */ GAME( 1994, maya, 0, sprtmtch, sprtmtch, maya, ROT0, "Promat", "Maya (set 1)", 0 ) // this set has backgrounds blacked out in attract -GAME( 1994, mayaa, maya, sprtmtch, sprtmtch, maya, ROT0, "Promat", "Maya (set 2)", 0 ) +GAME( 1994, mayaa, maya, sprtmtch, sprtmtch, maya, ROT0, "Promat", "Maya (set 2)", 0 ) GAME( 199?, inca, 0, sprtmtch, sprtmtch, maya, ROT0, "", "Inca", 0 ) GAME( 199?, blktouch, 0, sprtmtch, sprtmtch, blktouch, ROT0, "Yang Gi Co Ltd.", "Black Touch (Korea)", 0 ) diff --git a/src/mame/drivers/egghunt.c b/src/mame/drivers/egghunt.c index 0b2d6a0219c..4a66990cd97 100644 --- a/src/mame/drivers/egghunt.c +++ b/src/mame/drivers/egghunt.c @@ -51,7 +51,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, egghunt_state(machine)); } egghunt_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgram; UINT8 * atram; diff --git a/src/mame/drivers/embargo.c b/src/mame/drivers/embargo.c index 4e470c2d8e1..2f1455b8c55 100644 --- a/src/mame/drivers/embargo.c +++ b/src/mame/drivers/embargo.c @@ -14,7 +14,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, embargo_state(machine)); } embargo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c index 6aa5b50ec3b..38c3d0aebdc 100644 --- a/src/mame/drivers/enigma2.c +++ b/src/mame/drivers/enigma2.c @@ -60,7 +60,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, enigma2_state(machine)); } enigma2_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c index 69d02cf1e37..fd8db27cb95 100644 --- a/src/mame/drivers/exerion.c +++ b/src/mame/drivers/exerion.c @@ -246,8 +246,8 @@ static INPUT_PORTS_START( exerion ) PORT_DIPSETTING( 0x02, "3" ) PORT_DIPSETTING( 0x03, "4" ) PORT_DIPSETTING( 0x04, "5" ) -// PORT_DIPSETTING( 0x05, "5" ) /* duplicated setting */ -// PORT_DIPSETTING( 0x06, "5" ) /* duplicated setting */ +// PORT_DIPSETTING( 0x05, "5" ) /* duplicated setting */ +// PORT_DIPSETTING( 0x06, "5" ) /* duplicated setting */ PORT_DIPSETTING( 0x07, "254 (Cheat)") PORT_DIPNAME( 0x18, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPSETTING( 0x00, "10000" ) diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c index 6c0b7da5c6a..3b22ec01d66 100644 --- a/src/mame/drivers/f-32.c +++ b/src/mame/drivers/f-32.c @@ -23,7 +23,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mosaicf2_state(machine)); } mosaicf2_state(running_machine &machine) { } - + /* memory pointers */ UINT32 * videoram; }; diff --git a/src/mame/drivers/flyball.c b/src/mame/drivers/flyball.c index 39ae6d8221e..8b9e0253512 100644 --- a/src/mame/drivers/flyball.c +++ b/src/mame/drivers/flyball.c @@ -17,7 +17,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flyball_state(machine)); } flyball_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * rombase; UINT8 * playfield_ram; diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index bb1179c8e9a..de624301027 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -2601,7 +2601,7 @@ ROM_END - 2x HY18CV85 (electrically-erasable PLD) Some versions have Mexican Rockwell R65c02. - The game doesn't work with a regular 65c02 CPU. + The game doesn't work with a regular 65c02 CPU. */ ROM_START( magicrd2 ) /* Impera */ @@ -2747,7 +2747,7 @@ ROM_END | | | | | | | _________ ____ | | | | ___| | |__| | | | | | E | | F | | | |__| ___| | |__| |__| |_________| |____| |_______| ___| - | | + | | |_____________________________________________________________________________________________| @@ -2821,7 +2821,7 @@ Surely selectable through a PLD. ROM_START( jolyjokrb ) ROM_REGION( 0x18000, "maincpu", 0 ) /* Two slightly different programs. Using the 1st one...*/ ROM_LOAD( "unbekannt.bin", 0x8000, 0x10000, CRC(327fa3d7) SHA1(2435aada2377b2f8f01d059a7aba9bc7a8993537) ) /* 1st prg */ -// ROM_LOAD( "unbekannt.bin", 0x0000, 0x10000, CRC(327fa3d7) SHA1(2435aada2377b2f8f01d059a7aba9bc7a8993537) ) /* 2nd prg */ +// ROM_LOAD( "unbekannt.bin", 0x0000, 0x10000, CRC(327fa3d7) SHA1(2435aada2377b2f8f01d059a7aba9bc7a8993537) ) /* 2nd prg */ ROM_REGION( 0x20000, "gfx1", 0 ) ROM_LOAD( "ic25.bin", 0x00000, 0x10000, CRC(1bd067af) SHA1(9436fe085ba63c00a12ea80903470a84535e3dc1) ) diff --git a/src/mame/drivers/galaxi.c b/src/mame/drivers/galaxi.c index 1042e83bbec..0fcd3238cd3 100644 --- a/src/mame/drivers/galaxi.c +++ b/src/mame/drivers/galaxi.c @@ -50,7 +50,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galaxi_state(machine)); } galaxi_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg1_ram; UINT16 * bg2_ram; diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 55a91d5f917..6fe44814107 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -2886,7 +2886,7 @@ static DRIVER_INIT( thepitm ) /* move the interrupt enable from $b000 to $b001 */ memory_unmap_write(space, 0xb000, 0xb000, 0, 0x7f8); memory_install_write8_handler(space, 0xb001, 0xb001, 0, 0x7f8, irq_enable_w); - + /* disable the stars */ memory_unmap_write(space, 0xb004, 0xb004, 0, 0x07f8); diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c index f9e8e95df8a..fbf7f4eead1 100644 --- a/src/mame/drivers/galdrvr.c +++ b/src/mame/drivers/galdrvr.c @@ -2109,7 +2109,7 @@ static INPUT_PORTS_START( aracnis ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) + PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_START("IN1") /* 0xa800 - needs verifying */ @@ -5762,7 +5762,7 @@ ROM_END The Pit (on Moon Quasar hardware) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Dumped by Andrew Welburn +Dumped by Andrew Welburn on the sunny morning of 2/03/10 http://www.andys-arcade.com @@ -5772,20 +5772,20 @@ http://www.andys-arcade.com ************************************************* Nichibutsu Moon Quasar pcb largely unhacked, but -with an odd looking set of roms. One gfx rom -identifies itself as 'The Pit' so that is my only +with an odd looking set of roms. One gfx rom +identifies itself as 'The Pit' so that is my only guess at what the game actually is. -Roms 1 through 8 read well in-circuit in the right -places in the memory map for moon cresta, -(through the fluke 9100) but the game does not -currently run. Roms dumped adn verified with no +Roms 1 through 8 read well in-circuit in the right +places in the memory map for moon cresta, +(through the fluke 9100) but the game does not +currently run. Roms dumped adn verified with no anomolies. Rom 9 was placed on the through-socket and has pins 20 and 18 (/E and A11 respectively) tied to -pin 5 of 8E (A14/A15/MREQ demux). This demux has -some patches, the trace to pin 13 is cut, and is +pin 5 of 8E (A14/A15/MREQ demux). This demux has +some patches, the trace to pin 13 is cut, and is instead wired to pin 3. */ diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 0c2ca81364a..ee6b08ec575 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -40,7 +40,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, go2000_state(machine)); } go2000_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * videoram2; diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index 11a4c3ccd3b..5f5cea127bc 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -41,7 +41,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, good_state(machine)); } good_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg_tilemapram; UINT16 * fg_tilemapram; diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index f7600f59abe..e78d7aafebe 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -132,7 +132,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gstream_state(machine)); } gstream_state(running_machine &machine) { } - + /* memory pointers */ UINT32 * vram; UINT32 * workram; diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index 58f747b464e..47dd4ca0e49 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -51,7 +51,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hotblock_state(machine)); } hotblock_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * vram; UINT8 * pal; diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index bc8617763ff..be020257eec 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -89,7 +89,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, imolagp_state(machine)); } imolagp_state(running_machine &machine) { } - + UINT8 *slave_workram; // used only ifdef HLE_COM #ifdef HLE_COM diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index 6fc8d9710b8..c144f5ad0f9 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -39,7 +39,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jangou_state(machine)); } jangou_state(running_machine &machine) { } - + /* video-related */ UINT8 *blit_buffer; UINT8 pen_data[0x10]; diff --git a/src/mame/drivers/jantotsu.c b/src/mame/drivers/jantotsu.c index 7889b727f1d..336feddac93 100644 --- a/src/mame/drivers/jantotsu.c +++ b/src/mame/drivers/jantotsu.c @@ -105,7 +105,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jantotsu_state(machine)); } jantotsu_state(running_machine &machine) { } - + /* video-related */ UINT8 *bitmap; UINT8 vram_bank, col_bank; diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index 69ba156322f..80e9b6226cc 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -108,7 +108,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jollyjgr_state(machine)); } jollyjgr_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 9e16af42aba..27fea5c0b53 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -38,7 +38,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jongkyo_state(machine)); } jongkyo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/drivers/kingdrby.c b/src/mame/drivers/kingdrby.c index 2c31702e32d..34031109c45 100644 --- a/src/mame/drivers/kingdrby.c +++ b/src/mame/drivers/kingdrby.c @@ -378,7 +378,7 @@ static ADDRESS_MAP_START( slave_1986_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x7400, 0x74ff) AM_RAM AM_BASE_GENERIC(spriteram) AM_RANGE(0x7600, 0x7600) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x7601, 0x7601) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) -// AM_RANGE(0x7800, 0x7803) AM_READ(test_r) +// AM_RANGE(0x7800, 0x7803) AM_READ(test_r) AM_RANGE(0x7a00, 0x7a00) AM_RAM //buffer for the key matrix AM_RANGE(0x7c00, 0x7c00) AM_READ_PORT("DSW") ADDRESS_MAP_END @@ -1091,7 +1091,7 @@ ROM_START( kingdrbb ) // has 'Made in Taiwan' on the PCB. ROM_REGION( 0x200, "proms", 0 ) ROM_COPY( "raw_prom", 0x1000, 0x000, 0x200 ) -// ROM_COPY( "raw_prom", 0x3000, 0x200, 0x200 ) //identical to 0x1000 bank +// ROM_COPY( "raw_prom", 0x3000, 0x200, 0x200 ) //identical to 0x1000 bank ROM_REGION( 0x4000, "pals", 0 ) // all read protected ROM_LOAD( "palce16v.u101.bin", 0x0000, 0x117, CRC(c89d2f52) SHA1(f9d52d9c42ef95b7b85bbf6d09888ebdeac11fd3) ) diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index d55b9c33d23..371975001c6 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -51,7 +51,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, koikoi_state(machine)); } koikoi_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index 4c92ec88ca1..0faf886cfd2 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -26,7 +26,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, laserbas_state(machine)); } laserbas_state(running_machine &machine) { } - + /* video-related */ UINT8 *vram1; UINT8 *vram2; diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 1dd7bf3c101..326bfb354fd 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -72,7 +72,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lastfght_state(machine)); } lastfght_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * colorram; // UINT8 * nvram; // currently this uses generic nvram handling diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c index 69116222604..f3d3856d8ae 100644 --- a/src/mame/drivers/liberate.c +++ b/src/mame/drivers/liberate.c @@ -35,18 +35,18 @@ static READ8_HANDLER( deco16_bank_r ) return ROM[offset]; /* Else the handler falls through to read the usual address */ - if (offset < 0x400) + if (offset < 0x400) return state->colorram[offset]; - if (offset < 0x800) + if (offset < 0x800) return state->videoram[offset - 0x400]; - if (offset < 0x1000) + if (offset < 0x1000) return state->spriteram[offset - 0x800]; - if (offset < 0x2200) - { - logerror("%04x: Unmapped bank read %04x\n", cpu_get_pc(space->cpu), offset); - return 0; + if (offset < 0x2200) + { + logerror("%04x: Unmapped bank read %04x\n", cpu_get_pc(space->cpu), offset); + return 0; } - if (offset < 0x2800) + if (offset < 0x2800) return state->scratchram[offset - 0x2200]; logerror("%04x: Unmapped bank read %04x\n", cpu_get_pc(space->cpu), offset); @@ -86,20 +86,20 @@ static READ8_HANDLER( prosoccr_bank_r ) return ROM[offset]; /* Else the handler falls through to read the usual address */ - if (offset < 0x400) + if (offset < 0x400) return state->colorram[offset]; - if (offset < 0x800) + if (offset < 0x800) return state->videoram[offset - 0x400]; - if (offset < 0xc00) + if (offset < 0xc00) return state->colorram[offset - 0x800]; - if (offset < 0x1000) + if (offset < 0x1000) return state->spriteram[offset - 0xc00]; - if (offset < 0x2200) - { - logerror("%04x: Unmapped bank read %04x\n", cpu_get_pc(space->cpu), offset); - return 0; + if (offset < 0x2200) + { + logerror("%04x: Unmapped bank read %04x\n", cpu_get_pc(space->cpu), offset); + return 0; } - if (offset < 0x2800) + if (offset < 0x2800) return state->scratchram[offset - 0x2200]; logerror("%04x: Unmapped bank read %04x\n", cpu_get_pc(space->cpu), offset); diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c index 968b02a1b35..b80465ebb1a 100644 --- a/src/mame/drivers/lkage.c +++ b/src/mame/drivers/lkage.c @@ -88,9 +88,9 @@ TODO: static TIMER_CALLBACK( nmi_callback ) { lkage_state *state = (lkage_state *)machine->driver_data; - if (state->sound_nmi_enable) + if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); - else + else state->pending_nmi = 1; } @@ -112,7 +112,7 @@ static WRITE8_HANDLER( lkage_sh_nmi_enable_w ) state->sound_nmi_enable = 1; if (state->pending_nmi) - { + { /* probably wrong but commands may go lost otherwise */ cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); state->pending_nmi = 0; diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c index c4502f36ac7..d4baf6542b7 100644 --- a/src/mame/drivers/looping.c +++ b/src/mame/drivers/looping.c @@ -101,7 +101,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, looping_state(machine)); } looping_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c index bf6dfdd9422..8f9f8e22586 100644 --- a/src/mame/drivers/lsasquad.c +++ b/src/mame/drivers/lsasquad.c @@ -809,16 +809,16 @@ ROM_END /* coin inputs are inverted in storming */ -static DRIVER_INIT( lsasquad ) -{ +static DRIVER_INIT( lsasquad ) +{ lsasquad_state *state = (lsasquad_state *)machine->driver_data; - state->invertcoin = 0x00; + state->invertcoin = 0x00; } -static DRIVER_INIT( storming ) -{ +static DRIVER_INIT( storming ) +{ lsasquad_state *state = (lsasquad_state *)machine->driver_data; - state->invertcoin = 0x0c; + state->invertcoin = 0x0c; } diff --git a/src/mame/drivers/luckgrln.c b/src/mame/drivers/luckgrln.c index f43b2d358a9..901fd496c59 100644 --- a/src/mame/drivers/luckgrln.c +++ b/src/mame/drivers/luckgrln.c @@ -145,7 +145,7 @@ static WRITE8_HANDLER( output_w ) /* correct? */ nmi_enable = data & 1; // other values unknown -// printf("%02x\n",data); +// printf("%02x\n",data); } static READ8_HANDLER( test_r ) @@ -257,7 +257,7 @@ static DRIVER_INIT( luckgrln ) #endif // ?? -// memory_set_bankptr(machine, "bank1",&rom[0x010000]); +// memory_set_bankptr(machine, "bank1",&rom[0x010000]); } ROM_START( luckgrln ) diff --git a/src/mame/drivers/m14.c b/src/mame/drivers/m14.c index 4ca60ca2c16..be26b0c908b 100644 --- a/src/mame/drivers/m14.c +++ b/src/mame/drivers/m14.c @@ -60,7 +60,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m14_state(machine)); } m14_state(running_machine &machine) { } - + /* video-related */ tilemap_t *m14_tilemap; UINT8 * video_ram; diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c index ea3d4f10e73..dc4bd663cbb 100644 --- a/src/mame/drivers/m63.c +++ b/src/mame/drivers/m63.c @@ -127,7 +127,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m63_state(machine)); } m63_state(running_machine &machine) { } - + UINT8 * videoram; UINT8 * colorram; UINT8 * spriteram; diff --git a/src/mame/drivers/m79amb.c b/src/mame/drivers/m79amb.c index c8e411343bd..85c4089ad54 100644 --- a/src/mame/drivers/m79amb.c +++ b/src/mame/drivers/m79amb.c @@ -64,7 +64,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m79amb_state(machine)); } m79amb_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * mask; @@ -301,12 +301,12 @@ static DRIVER_INIT( m79amb ) rom[i] = ~rom[i]; /* gun positions */ - for (i = 0; i < 0x100; i++) + for (i = 0; i < 0x100; i++) { /* gun 1, start at left 18 */ - for (j = 0; j < 0x20; j++) + for (j = 0; j < 0x20; j++) { - if (i <= lut_cross[j]) + if (i <= lut_cross[j]) { state->lut_gun1[i] = lut_pos[j]; break; @@ -314,9 +314,9 @@ static DRIVER_INIT( m79amb ) } /* gun 2, start at right 235 */ - for (j = 0; j < 0x20; j++) + for (j = 0; j < 0x20; j++) { - if (i >= (253 - lut_cross[j])) + if (i >= (253 - lut_cross[j])) { state->lut_gun2[i] = lut_pos[j]; break; diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index ba70b040b12..91f7ebe852b 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -136,15 +136,15 @@ static WRITE8_HANDLER( macs_output_w ) { case 0: /* - --x- ---- sets RAM bank? - ---- -x-- Cassette B slot - ---- --x- Cassette A slot - */ + --x- ---- sets RAM bank? + ---- -x-- Cassette B slot + ---- --x- Cassette A slot + */ if(macs_rev == 1) { /* FIXME: dunno if this RAM bank is right, DASM tracking made on the POST screens indicates that there's just one RAM bank, - but then MACS2 games locks up. */ + but then MACS2 games locks up. */ memory_set_bankptr(space->machine, "bank3", &macs_ram1[((data&0x20)>>5)*0x1000+0x000] ); macs_cart_slot = (data & 0xc) >> 2; diff --git a/src/mame/drivers/marinedt.c b/src/mame/drivers/marinedt.c index 880e20c2927..b3c28d948e1 100644 --- a/src/mame/drivers/marinedt.c +++ b/src/mame/drivers/marinedt.c @@ -103,7 +103,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, marinedt_state(machine)); } marinedt_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * tx_tileram; @@ -163,9 +163,9 @@ static READ8_HANDLER( marinedt_obj1_x_r ) marinedt_state *state = (marinedt_state *)space->machine->driver_data; UINT8 *RAM = memory_region(space->machine, "maincpu"); - if (RAM[0x430e]) - --state->cx; - else + if (RAM[0x430e]) + --state->cx; + else ++state->cx; //figure out why inc/dec based on 430e? @@ -181,7 +181,7 @@ static READ8_HANDLER( marinedt_obj1_yr_r ) marinedt_state *state = (marinedt_state *)space->machine->driver_data; //has to be +1 if cx went over? - if (state->cx == 0x10) + if (state->cx == 0x10) state->cyr++; return state->cyr | (state->cyrh << 4); diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c index 4781bf7aaaf..f5e9dd5b2a0 100644 --- a/src/mame/drivers/mayumi.c +++ b/src/mame/drivers/mayumi.c @@ -19,10 +19,10 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mayumi_state(machine)); } mayumi_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; -// UINT8 * nvram; // this currently uses generic nvram handlers +// UINT8 * nvram; // this currently uses generic nvram handlers /* video-related */ tilemap_t *tilemap; diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c index 4640f69951e..690890e753e 100644 --- a/src/mame/drivers/mazerbla.c +++ b/src/mame/drivers/mazerbla.c @@ -54,7 +54,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mazerbla_state(machine)); } mazerbla_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * cfb_ram; UINT8 * videoram; @@ -69,7 +69,7 @@ public: UINT8 bknd_col; UINT8 port02_status; - UINT8 vbank; /* video page select signal, likely for double buffering ?*/ + UINT8 vbank; /* video page select signal, likely for double buffering ?*/ UINT32 xpos, ypos, pix_xsize, pix_ysize; UINT8 color1, color2, mode, plane; UINT8 lookup_ram[0x100*4]; diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index 700eb6cb646..bf0f4ee4400 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -1647,7 +1647,7 @@ INPUT_PORTS_START(mk3ghw) PORT_DIPSETTING( 0x05, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) PORT_BIT( 0xf8, 0x00, IPT_UNUSED ) - + PORT_START("DSWB") PORT_DIPUNKNOWN( 0x01, 0x00 ) PORT_DIPUNKNOWN( 0x02, 0x00 ) diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c index 12caa05fd10..73e952c2b62 100644 --- a/src/mame/drivers/megazone.c +++ b/src/mame/drivers/megazone.c @@ -46,9 +46,9 @@ static WRITE8_DEVICE_HANDLER( megazone_port_b_w ) for (i = 0; i < 3; i++) { int C = 0; - if (data & 1) + if (data & 1) C += 10000; /* 10000pF = 0.01uF */ - if (data & 2) + if (data & 2) C += 220000; /* 220000pF = 0.22uF */ data >>= 2; diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c index 8ca4988e371..3608ba96f4b 100644 --- a/src/mame/drivers/meijinsn.c +++ b/src/mame/drivers/meijinsn.c @@ -71,7 +71,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, meijinsn_state(machine)); } meijinsn_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * shared_ram; UINT16 * videoram; @@ -116,7 +116,7 @@ static READ16_HANDLER( alpha_mcu_r ) state->credits = 0; - if ((input_port_read(space->machine, "COINS") & 0x3) == 3) + if ((input_port_read(space->machine, "COINS") & 0x3) == 3) state->mcu_latch = 0; if ((input_port_read(space->machine, "COINS") & 0x1) == 0 && !state->mcu_latch) diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c index ffb66ea85b0..2556a350a51 100644 --- a/src/mame/drivers/meritm.c +++ b/src/mame/drivers/meritm.c @@ -318,13 +318,13 @@ static INTERRUPT_GEN( meritm_interrupt ) static void meritm_vdp0_interrupt(running_machine *machine, int i) { /* this is not used as the v9938 interrupt callbacks are broken - interrupts seem to be fired quite randomly */ + interrupts seem to be fired quite randomly */ } static void meritm_vdp1_interrupt(running_machine *machine, int i) { /* this is not used as the v9938 interrupt callbacks are broken - interrupts seem to be fired quite randomly */ + interrupts seem to be fired quite randomly */ } static int layer0_enabled, layer1_enabled; @@ -819,18 +819,18 @@ static READ8_DEVICE_HANDLER(meritm_audio_pio_port_a_r) { /* - bit signal description + bit signal description - 0 BANK0 - 1 BANK1 - 2 BANK2 - 3 /VINT1 V9938 #1 INT - 4 /VINT2 V9938 #2 INT - 5 BANK3 - 6 - 7 + 0 BANK0 + 1 BANK1 + 2 BANK2 + 3 /VINT1 V9938 #1 INT + 4 /VINT2 V9938 #2 INT + 5 BANK3 + 6 + 7 - */ + */ return meritm_vint; }; @@ -839,18 +839,18 @@ static READ8_DEVICE_HANDLER(meritm_audio_pio_port_b_r) { /* - bit description + bit description - 0 J4 D0 - 1 J4 D1 - 2 J4 D2 - 3 J4 D3 - 4 J4 D4 - 5 J4 D5 - 6 J4 D6 - 7 J4 D7 + 0 J4 D0 + 1 J4 D1 + 2 J4 D2 + 3 J4 D3 + 4 J4 D4 + 5 J4 D5 + 6 J4 D6 + 7 J4 D7 - */ + */ return ds1204_r(); }; @@ -859,18 +859,18 @@ static WRITE8_DEVICE_HANDLER(meritm_audio_pio_port_a_w) { /* - bit signal description + bit signal description - 0 BANK0 - 1 BANK1 - 2 BANK2 - 3 /VINT1 V9938 #1 INT - 4 /VINT2 V9938 #2 INT - 5 BANK3 - 6 - 7 + 0 BANK0 + 1 BANK1 + 2 BANK2 + 3 /VINT1 V9938 #1 INT + 4 /VINT2 V9938 #2 INT + 5 BANK3 + 6 + 7 - */ + */ meritm_bank = (data & 7) | ((data >> 2) & 0x18); //logerror("Writing BANK with %x (raw = %x)\n", meritm_bank, data); @@ -880,18 +880,18 @@ static WRITE8_DEVICE_HANDLER(meritm_audio_pio_port_b_w) { /* - bit description + bit description - 0 J4 D0 - 1 J4 D1 - 2 J4 D2 - 3 J4 D3 - 4 J4 D4 - 5 J4 D5 - 6 J4 D6 - 7 J4 D7 + 0 J4 D0 + 1 J4 D1 + 2 J4 D2 + 3 J4 D3 + 4 J4 D4 + 5 J4 D5 + 6 J4 D6 + 7 J4 D7 - */ + */ ds1204_w((data & 0x4) >> 2, (data & 0x2) >> 1, data & 0x01); }; @@ -900,36 +900,36 @@ static WRITE8_DEVICE_HANDLER(meritm_io_pio_port_a_w) { /* - bit description + bit description - 0 J3 PE0 - 1 J3 PE1 - 2 J3 PE2 - 3 J3 PE3 - 4 J3 PE4 - 5 J3 PE5 - 6 J3 PE6 - 7 J3 PE7 + 0 J3 PE0 + 1 J3 PE1 + 2 J3 PE2 + 3 J3 PE3 + 4 J3 PE4 + 5 J3 PE5 + 6 J3 PE6 + 7 J3 PE7 - */ + */ }; static WRITE8_DEVICE_HANDLER(meritm_io_pio_port_b_w) { /* - bit description + bit description - 0 J3 PF0 - 1 J3 PF1 - 2 J3 PF2 - 3 J3 PF3 - 4 J3 PF4 - 5 J3 PF5 - 6 J3 PF6 - 7 J3 PF7 + 0 J3 PF0 + 1 J3 PF1 + 2 J3 PF2 + 3 J3 PF3 + 4 J3 PF4 + 5 J3 PF5 + 6 J3 PF6 + 7 J3 PF7 - */ + */ }; static Z80PIO_INTERFACE( meritm_audio_pio_intf ) diff --git a/src/mame/drivers/mgolf.c b/src/mame/drivers/mgolf.c index 366cb1cfcc2..1f782a5e603 100644 --- a/src/mame/drivers/mgolf.c +++ b/src/mame/drivers/mgolf.c @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mgolf_state(machine)); } mgolf_state(running_machine &machine) { } - + /* memory pointers */ UINT8* video_ram; diff --git a/src/mame/drivers/minivadr.c b/src/mame/drivers/minivadr.c index f1dba14b468..d2c63d447e6 100644 --- a/src/mame/drivers/minivadr.c +++ b/src/mame/drivers/minivadr.c @@ -20,7 +20,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, minivadr_state(machine)); } minivadr_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index 6aa299475eb..b69d055e448 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -76,16 +76,16 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = spriteram[offs + 1]; - if (!sprite) + if (!sprite) continue; y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; - if (pri != ((y & 0x8000) >> 15)) + if (pri != ((y & 0x8000) >> 15)) continue; x = spriteram[offs + 2]; @@ -103,7 +103,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = 240 - y; x = 304 - x; - if (x > 320) + if (x > 320) continue; sprite &= ~multi; diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c index 25e0a22e479..d70ee13575e 100644 --- a/src/mame/drivers/mjsister.c +++ b/src/mame/drivers/mjsister.c @@ -21,7 +21,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mjsister_state(machine)); } mjsister_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram0, *videoram1; diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index ed6a622ad5f..2f803fb75dd 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -4700,7 +4700,7 @@ ROM_START( lamachin ) /* Step 2.0 317-0242-COM security chip (837-13576-com se ROM_LOAD64_WORD_SWAP( "mpr21461.11", 0x2800002, 0x400000, CRC(33d8f0da) SHA1(f77fd50b06a05c0809d3e90d70525ff67136908b) ) ROM_LOAD64_WORD_SWAP( "mpr21462.12", 0x2800000, 0x400000, CRC(03d22ee8) SHA1(cb0c80aefc2aa7127a5f882ecb61c29f2cd3eb4e) ) - + ROM_REGION( 0x2000000, "user3", 0 ) /* Video ROMs Part 1 */ ROM_LOAD_VROM( "mpr21467.26", 0x000002, 0x400000, CRC(73635100) SHA1(70850cbd39ac5ddc443c9c24ac24c554d1565b1a) ) ROM_LOAD_VROM( "mpr21468.27", 0x000000, 0x400000, CRC(462e5c81) SHA1(05eb1f580a9dcd1f59ccb2791e974325494e5910) ) diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c index e2b33a85e97..ecd8d13475d 100644 --- a/src/mame/drivers/mogura.c +++ b/src/mame/drivers/mogura.c @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mogura_state(machine)); } mogura_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * tileram; UINT8 * gfxram; diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c index 8e5ad7ccf47..a584cc206d5 100644 --- a/src/mame/drivers/mole.c +++ b/src/mame/drivers/mole.c @@ -59,7 +59,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mole_state(machine)); } mole_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * tileram; diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c index 14023690eba..d0da8104895 100644 --- a/src/mame/drivers/mrflea.c +++ b/src/mame/drivers/mrflea.c @@ -114,7 +114,7 @@ static READ8_HANDLER( mrflea_interrupt_type_r ) */ mrflea_state *state = (mrflea_state *)space->machine->driver_data; - if (state->status & 0x08 ) + if (state->status & 0x08 ) return 0x00; /* process command */ return 0x01; /* music/sound update? */ diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c index e419dc5867a..118999ffef9 100644 --- a/src/mame/drivers/munchmo.c +++ b/src/mame/drivers/munchmo.c @@ -48,9 +48,9 @@ static INTERRUPT_GEN( mnchmobl_interrupt ) munchmo_state *state = (munchmo_state *)device->machine->driver_data; state->which = !state->which; - if (state->which) + if (state->which) cpu_set_input_line(device, 0, HOLD_LINE); - else if (state->nmi_enable) + else if (state->nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/mwarr.c b/src/mame/drivers/mwarr.c index 1ff1894bb96..f2bc912282f 100644 --- a/src/mame/drivers/mwarr.c +++ b/src/mame/drivers/mwarr.c @@ -52,7 +52,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mwarr_state(machine)); } mwarr_state(running_machine &machine) { } - + /* memory pointers */ UINT16 *bg_videoram, *mlow_videoram, *mhigh_videoram, *tx_videoram, *sprites_buffer; UINT16 *bg_scrollram, *mlow_scrollram, *mhigh_scrollram, *vidattrram; diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index 50041229d26..deed867395c 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -37,7 +37,7 @@ Soul Calibur (SOC11/VER.A2) (C) Namco, 1998 COH-700 SYS Soul Calibur (SOC11/VER.B) (C) Namco, 1998 COH-700 SYSTEM12 MOTHER(B) SYSTEM12 M5F2 KC020 Soul Calibur (SOC11/VER.C) (C) Namco, 1998 COH-700 SYSTEM12 MOTHER(B) SYSTEM12 M5F4 KC020 Soul Calibur (SOC13/VER.B) (C) Namco, 1998 COH-700 SYSTEM12 MOTHER(B) SYSTEM12 M5F4 KC020 -Soul Calibur (SOC14/VER.B) (C) Namco, 1998 COH-700 SYSTEM12 MOTHER(B) SYSTEM12 M5F4 KC020 +Soul Calibur (SOC14/VER.B) (C) Namco, 1998 COH-700 SYSTEM12 MOTHER(B) SYSTEM12 M5F4 KC020 Soul Calibur (SOC14/VER.C) (C) Namco, 1998 COH-700 SYSTEM12 MOTHER JO 11-04-98 none Super World Stadium '98 (SS81/VER.A) (C) Namco, 1998 COH-700 SYSTEM12 MOTHER(B) SYSTEM12 M4F6 KC025 Super World Stadium '99 (SS91/VER.A3) (C) Namco, 1999 COH-700 SYSTEM12 MOTHER(B) SYSTEM12 M5F4 KC043 @@ -1998,8 +1998,8 @@ ROM_END ROM_START( soulclbrb ) ROM_REGION32_LE( 0x00400000, "user1", 0 ) /* main prg */ - ROM_LOAD16_BYTE( "soc14verb.2l", 0x000000, 0x200000, CRC(6af5c5f6) SHA1(51d1e7d78d95cfc765cd219ed07b405cd920044b) ) - ROM_LOAD16_BYTE( "soc14verb.2p", 0x000001, 0x200000, CRC(23e7a4c4) SHA1(a97f36cafdeff9e26fbd24e54ab8ac8080763761) ) + ROM_LOAD16_BYTE( "soc14verb.2l", 0x000000, 0x200000, CRC(6af5c5f6) SHA1(51d1e7d78d95cfc765cd219ed07b405cd920044b) ) + ROM_LOAD16_BYTE( "soc14verb.2p", 0x000001, 0x200000, CRC(23e7a4c4) SHA1(a97f36cafdeff9e26fbd24e54ab8ac8080763761) ) ROM_REGION32_LE( 0x2000000, "user2", 0 ) /* main data */ ROM_LOAD( "soc1rom0.7", 0x0000000, 0x800000, CRC(cdc47b55) SHA1(315ea6b819de5c4883aa400f1b9f4172637757bf) ) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 23b49691c72..07db47a1df0 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -1168,7 +1168,7 @@ static READ16_HANDLER(s23_c417_16_r) case 0: return 0x8e | (video_screen_get_vblank(space->machine->primary_screen) ? 0x8000 : 0); case 1: return c417_adr; case 4: - // logerror("c417_r %04x = %04x (%08x, %08x)\n", c417_adr, c417_ram[c417_adr], cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + // logerror("c417_r %04x = %04x (%08x, %08x)\n", c417_adr, c417_ram[c417_adr], cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); return c417_ram[c417_adr]; } @@ -1200,7 +1200,7 @@ static READ32_HANDLER(s23_c417_32_r) data |= s23_c417_16_r(space, offset*2, mem_mask >> 16) << 16; if (ACCESSING_BITS_0_15) data |= s23_c417_16_r(space, offset*2+1, mem_mask); - return data; + return data; } static WRITE32_HANDLER(s23_c417_32_w) @@ -1213,7 +1213,7 @@ static WRITE32_HANDLER(s23_c417_32_w) static READ16_HANDLER(s23_c412_ram_r) { - // logerror("c412_ram_r %06x (%08x, %08x)\n", offset, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + // logerror("c412_ram_r %06x (%08x, %08x)\n", offset, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); if(offset < 0x100000) return c412_sdram_a[offset & 0xfffff]; else if(offset < 0x200000) @@ -1228,7 +1228,7 @@ static READ16_HANDLER(s23_c412_ram_r) static WRITE16_HANDLER(s23_c412_ram_w) { - // logerror("c412_ram_w %06x = %04x (%08x, %08x)\n", offset, data, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + // logerror("c412_ram_w %06x = %04x (%08x, %08x)\n", offset, data, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); if(offset < 0x100000) COMBINE_DATA(c412_sdram_a + (offset & 0xfffff)); else if(offset < 0x200000) @@ -1270,7 +1270,7 @@ static READ32_HANDLER(s23_c412_32_r) data |= s23_c412_16_r(space, offset*2, mem_mask >> 16) << 16; if (ACCESSING_BITS_0_15) data |= s23_c412_16_r(space, offset*2+1, mem_mask); - return data; + return data; } static WRITE32_HANDLER(s23_c412_32_w) @@ -1284,7 +1284,7 @@ static WRITE32_HANDLER(s23_c412_32_w) static READ16_HANDLER(s23_c421_ram_r) { - // logerror("c421_ram_r %06x (%08x, %08x)\n", offset, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + // logerror("c421_ram_r %06x (%08x, %08x)\n", offset, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); if(offset < 0x40000) return c421_dram_a[offset & 0x3ffff]; else if(offset < 0x80000) @@ -1297,7 +1297,7 @@ static READ16_HANDLER(s23_c421_ram_r) static WRITE16_HANDLER(s23_c421_ram_w) { - // logerror("c421_ram_w %06x = %04x (%08x, %08x)\n", offset, data, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + // logerror("c421_ram_w %06x = %04x (%08x, %08x)\n", offset, data, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); if(offset < 0x40000) COMBINE_DATA(c421_dram_a + (offset & 0x3ffff)); else if(offset < 0x80000) @@ -1337,7 +1337,7 @@ static READ32_HANDLER(s23_c421_32_r) data |= s23_c421_16_r(space, offset*2, mem_mask >> 16) << 16; if (ACCESSING_BITS_0_15) data |= s23_c421_16_r(space, offset*2+1, mem_mask); - return data; + return data; } static WRITE32_HANDLER(s23_c421_32_w) @@ -1379,7 +1379,7 @@ static WRITE16_HANDLER(s23_ctl_16_w) break; default: - logerror("ctl_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + logerror("ctl_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); } } @@ -1398,7 +1398,7 @@ static READ16_HANDLER(s23_ctl_16_r) return res; } } - logerror("ctl_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + logerror("ctl_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); return 0xffff; } @@ -1417,7 +1417,7 @@ static READ32_HANDLER(s23_ctl_32_r) data |= s23_ctl_16_r(space, offset*2, mem_mask >> 16) << 16; if (ACCESSING_BITS_0_15) data |= s23_ctl_16_r(space, offset*2+1, mem_mask); - return data; + return data; } @@ -1425,7 +1425,7 @@ static WRITE16_HANDLER(s23_c361_16_w) { switch(offset) { default: - logerror("c361_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + logerror("c361_w %x, %04x @ %04x (%08x, %08x)\n", offset, data, mem_mask, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); } } @@ -1435,7 +1435,7 @@ static READ16_HANDLER(s23_c361_16_r) case 5: return video_screen_get_vpos(space->machine->primary_screen); case 6: return video_screen_get_vblank(space->machine->primary_screen); } - logerror("c361_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); + logerror("c361_r %x @ %04x (%08x, %08x)\n", offset, mem_mask, cpu_get_pc(space->cpu), (unsigned int)cpu_get_reg(space->cpu, MIPS3_R31)); return 0xffff; } @@ -1454,7 +1454,7 @@ static READ32_HANDLER(s23_c361_32_r) data |= s23_c361_16_r(space, offset*2, mem_mask >> 16) << 16; if (ACCESSING_BITS_0_15) data |= s23_c361_16_r(space, offset*2+1, mem_mask); - return data; + return data; } static INTERRUPT_GEN(s23_interrupt) @@ -1490,10 +1490,10 @@ static READ32_HANDLER( gorgon_magic_r ) return 0xffffffff; // must be non-zero (rapidrvr @ 8000229C) } -/* - Final Furlong has a bug: it forgets to halt the H8/3002 before it zeros out the shared RAM - which contains the H8's stack and other working set. This crashes MAME due to the PC going - off into the weeds, so we intercept +/* + Final Furlong has a bug: it forgets to halt the H8/3002 before it zeros out the shared RAM + which contains the H8's stack and other working set. This crashes MAME due to the PC going + off into the weeds, so we intercept */ static READ32_HANDLER( gorgon_sharedram_r ) @@ -1765,7 +1765,7 @@ static INPUT_PORTS_START( ss23 ) PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // this is the "coin acceptor connected" signal PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) @@ -1862,7 +1862,7 @@ static READ8_HANDLER(iob_r) static ADDRESS_MAP_START( s23iobrdmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0000, 0x1fff) AM_ROM AM_REGION("ioboard", 0) AM_RANGE(0x6000, 0x6000) AM_READ_PORT("TC2P0") // 0-1 = coin 0-3 = coin connect, 0-5 = test 0-6 = down select, 0-7 = up select, 0-8 = enter - AM_RANGE(0x6001, 0x6001) AM_READ_PORT("TC2P1") // 1-1 = gun trigger 1-2 = foot pedal + AM_RANGE(0x6001, 0x6001) AM_READ_PORT("TC2P1") // 1-1 = gun trigger 1-2 = foot pedal AM_RANGE(0x6002, 0x6003) AM_READ( iob_r ) AM_RANGE(0x7000, 0x700f) AM_READ( iob_r ) @@ -1892,7 +1892,7 @@ static DRIVER_INIT(ss23) s23_tssio_port_4 = 0; s23_porta = 0, s23_rtcstate = 0; - if ((!strcmp(machine->gamedrv->name, "motoxgo")) || + if ((!strcmp(machine->gamedrv->name, "motoxgo")) || (!strcmp(machine->gamedrv->name, "panicprk")) || (!strcmp(machine->gamedrv->name, "rapidrvr")) || (!strcmp(machine->gamedrv->name, "finlflng")) || @@ -2091,7 +2091,7 @@ ROM_START( rapidrvr ) ROM_LOAD16_WORD_SWAP( "rd3verc.ic3", 0x000000, 0x080000, CRC(6e26fbaf) SHA1(4ab6637d22f0d26f7e1d10e9c80059c56f64303d) ) ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3334 MCU code */ - ROM_LOAD( "asca1_io-a.ic2", 0x000000, 0x040000, CRC(77cdf69a) SHA1(497af1059f85c07bea2dd0d303481623f6019dcf) ) + ROM_LOAD( "asca1_io-a.ic2", 0x000000, 0x040000, CRC(77cdf69a) SHA1(497af1059f85c07bea2dd0d303481623f6019dcf) ) ROM_REGION32_BE( 0x800000, "data", 0 ) /* data */ ROM_LOAD16_BYTE( "rd1mtah.3j", 0x000000, 0x400000, CRC(d8fa0f3d) SHA1(0d5bdb3a2e7be1dffe11b74baa2c10bfe011ae92) ) @@ -2153,7 +2153,7 @@ ROM_START( finlflng ) ROM_LOAD16_WORD_SWAP( "ff2vera.ic3", 0x000000, 0x080000, CRC(ab681078) SHA1(ec8367404458a54893ab6bea29c8a2ba3272b816) ) ROM_REGION( 0x40000, "ioboard", 0 ) /* I/O board HD643334 H8/3334 MCU code */ - ROM_LOAD( "asca1_io-a.ic2", 0x000000, 0x040000, CRC(77cdf69a) SHA1(497af1059f85c07bea2dd0d303481623f6019dcf) ) + ROM_LOAD( "asca1_io-a.ic2", 0x000000, 0x040000, CRC(77cdf69a) SHA1(497af1059f85c07bea2dd0d303481623f6019dcf) ) ROM_REGION32_BE( 0x800000, "data", 0 ) /* data */ ROM_LOAD16_BYTE( "ff2mtah.3j", 0x000000, 0x400000, CRC(161003cd) SHA1(04409333a4776b17700fc6d1aa06a39560132e03) ) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index b017cfc7bde..3c7dc01d8f3 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -3029,7 +3029,7 @@ ROM_START( gram2000 ) ROM_LOAD32_WORD("mpr-23376.ic36", 0xa000002, 0x0800000, CRC(e09cb473) SHA1(c3ec980f1a56142a0e06bae9594d6038acf0690d) ) //ic 21 ROM_COPY( "user1", 0x1400000, 0x0800000, 0x0800000 ) // mirror data so IC1 check can pass - //ROM_COPY( "user1", 0x1000000, 0x0400000, 0x0c00000 ) // or does it mirror the start of 17/18 from 0x0400000 upwards like this, check on real hw + //ROM_COPY( "user1", 0x1000000, 0x0400000, 0x0c00000 ) // or does it mirror the start of 17/18 from 0x0400000 upwards like this, check on real hw ROM_END ROM_START( crackndj ) @@ -4491,7 +4491,7 @@ ROM_START( gundmgd ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5069-COM) //(sticker 253-5509-5069) - ROM_LOAD("317-5069-com.pic", 0x00, 0x4000, CRC(44d0b242) SHA1(cac31c2ed317e2b44ee93d762188aacea2398949) ) + ROM_LOAD("317-5069-com.pic", 0x00, 0x4000, CRC(44d0b242) SHA1(cac31c2ed317e2b44ee93d762188aacea2398949) ) ROM_END @@ -4511,7 +4511,7 @@ ROM_START( sfz3ugd ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5072-COM) //(sticker 253-5509-5072) - ROM_LOAD("317-5072-com.pic", 0x00, 0x4000, CRC(3238ba01) SHA1(07c28f17c19eaa652295bbf2d3a96aa27c3748ae) ) + ROM_LOAD("317-5072-com.pic", 0x00, 0x4000, CRC(3238ba01) SHA1(07c28f17c19eaa652295bbf2d3a96aa27c3748ae) ) ROM_END ROM_START( cvsgd ) @@ -4529,7 +4529,7 @@ ROM_START( cvsgd ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5076-JPN) //(sticker 253-5509-5076J) - ROM_LOAD("317-5076-jpn.pic", 0x00, 0x4000, CRC(7c125b10) SHA1(557675e33bb45e4969560bbfd61f48d1784a728d) ) + ROM_LOAD("317-5076-jpn.pic", 0x00, 0x4000, CRC(7c125b10) SHA1(557675e33bb45e4969560bbfd61f48d1784a728d) ) ROM_END @@ -4544,11 +4544,11 @@ ROM_START( gundmxgd ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) //ROM_LOAD("317-5079-com.data", 0x00, 0x50, CRC(e6abe978) SHA1(700e610d84e517793a22d6cabd1aef9c3b8bc092) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5079-COM) //(sticker 253-5509-5079) - ROM_LOAD("317-5079-com.pic", 0x00, 0x4000, CRC(8f9fb55d) SHA1(ca93814ae7a4e99762dd1c2a743e21402b143811) ) + ROM_LOAD("317-5079-com.pic", 0x00, 0x4000, CRC(8f9fb55d) SHA1(ca93814ae7a4e99762dd1c2a743e21402b143811) ) ROM_END @@ -4567,7 +4567,7 @@ ROM_START( cvs2gd ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5078-COM) //(sticker 253-5509-5078) - ROM_LOAD("317-5078-com.pic", 0x00, 0x4000, CRC(e7bb621d) SHA1(0882d0e12ca4fb81dda2268cd12724a10278c220) ) + ROM_LOAD("317-5078-com.pic", 0x00, 0x4000, CRC(e7bb621d) SHA1(0882d0e12ca4fb81dda2268cd12724a10278c220) ) ROM_END ROM_START( ikaruga ) @@ -4585,7 +4585,7 @@ ROM_START( ikaruga ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5081-JPN) //(sticker 253-5509-5081J) - ROM_LOAD("317-5081-jpn.pic", 0x00, 0x4000, CRC(72ca4579) SHA1(8a46e92fc4a32016438ea877807928b51b3f3861) ) + ROM_LOAD("317-5081-jpn.pic", 0x00, 0x4000, CRC(72ca4579) SHA1(8a46e92fc4a32016438ea877807928b51b3f3861) ) ROM_END @@ -4599,9 +4599,9 @@ ROM_START( ggxx ) DISK_IMAGE_READONLY( "gdl-0011", 0, SHA1(b7328eb2c588d55284bdcea0fe89bb8e629a8669) ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) -// ROM_LOAD("317-5082-com.data", 0x00, 0x50, CRC(fa31209d) SHA1(bb18e6412a02510832f7200a06a3179ef1695ef2) ) -// ROM_REGION( 0x9a49, "pichex", ROMREGION_ERASE) -// ROM_LOAD("gdl-0011.hex", 0x00, 0x0009a49, CRC(36361df8) SHA1(86aa50c9b3debd49c7b67f1c9bfd052c0fefc593) ) // actual decap results for ggxx in ascii/hex form +// ROM_LOAD("317-5082-com.data", 0x00, 0x50, CRC(fa31209d) SHA1(bb18e6412a02510832f7200a06a3179ef1695ef2) ) +// ROM_REGION( 0x9a49, "pichex", ROMREGION_ERASE) +// ROM_LOAD("gdl-0011.hex", 0x00, 0x0009a49, CRC(36361df8) SHA1(86aa50c9b3debd49c7b67f1c9bfd052c0fefc593) ) // actual decap results for ggxx in ascii/hex form ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5082-COM) @@ -4625,8 +4625,8 @@ ROM_START( moeru ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5084-JPN) //(sticker 253-5509-5084J) - ROM_LOAD("317-5084-jpn.pic", 0x00, 0x4000, CRC(db7dac1e) SHA1(b6f7afe9d9d2681005c1abcd4fde24867e65d1e4) ) - + ROM_LOAD("317-5084-jpn.pic", 0x00, 0x4000, CRC(db7dac1e) SHA1(b6f7afe9d9d2681005c1abcd4fde24867e65d1e4) ) + ROM_END @@ -4645,7 +4645,7 @@ ROM_START( chocomk ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5085-JPN) //(sticker 253-5509-5085J) - ROM_LOAD("317-5085-jpn.pic", 0x00, 0x4000, CRC(677fd544) SHA1(cccd4931bfe3fbcfcde6722088961ddf29a45e89) ) + ROM_LOAD("317-5085-jpn.pic", 0x00, 0x4000, CRC(677fd544) SHA1(cccd4931bfe3fbcfcde6722088961ddf29a45e89) ) ROM_END @@ -4664,7 +4664,7 @@ ROM_START( quizqgd ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5090-JPN) //(sticker 253-5509-5090J) - ROM_LOAD("317-5090-jpn.pic", 0x00, 0x4000, CRC(141cced2) SHA1(c7fe2fc61be3585e95a2ce4c6d4373ea71e920de) ) + ROM_LOAD("317-5090-jpn.pic", 0x00, 0x4000, CRC(141cced2) SHA1(c7fe2fc61be3585e95a2ce4c6d4373ea71e920de) ) ROM_END ROM_START( azumanga ) @@ -4697,7 +4697,7 @@ ROM_START( ggxxrl ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5092-JPN) //(sticker 253-5509-5092J) - ROM_LOAD("317-5092-jpn.pic", 0x00, 0x4000, CRC(7ad7b541) SHA1(45c1e3da030add3bb07797ee7f22003224ae3f7f) ) + ROM_LOAD("317-5092-jpn.pic", 0x00, 0x4000, CRC(7ad7b541) SHA1(45c1e3da030add3bb07797ee7f22003224ae3f7f) ) ROM_END @@ -4716,7 +4716,7 @@ ROM_START( tetkiwam ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5093-JPN) //(sticker 253-5509-5093J) - ROM_LOAD("317-5093-jpn.pic", 0x00, 0x4000, CRC(a61e1e2a) SHA1(ccbec76da6454d4d2384a2adb3f8b62aa1fece24) ) + ROM_LOAD("317-5093-jpn.pic", 0x00, 0x4000, CRC(a61e1e2a) SHA1(ccbec76da6454d4d2384a2adb3f8b62aa1fece24) ) ROM_END @@ -4735,7 +4735,7 @@ ROM_START( shikgam2 ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5095-JPN) //(sticker 253-5509-5095J) - ROM_LOAD("317-5095-jpn.pic", 0x00, 0x4000, CRC(7c25cb5c) SHA1(02797e890030ddf2df470e85ebd6c539f6621e53) ) + ROM_LOAD("317-5095-jpn.pic", 0x00, 0x4000, CRC(7c25cb5c) SHA1(02797e890030ddf2df470e85ebd6c539f6621e53) ) ROM_END @@ -4754,7 +4754,7 @@ ROM_START( usagui ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5096-JPN) //(sticker 253-5509-5096J) - ROM_LOAD("317-5096-jpn.pic", 0x00, 0x4000, CRC(2d16887b) SHA1(32d11691c3d1242b16bc3fbcc0f1157bb16436e0) ) + ROM_LOAD("317-5096-jpn.pic", 0x00, 0x4000, CRC(2d16887b) SHA1(32d11691c3d1242b16bc3fbcc0f1157bb16436e0) ) ROM_END @@ -4793,7 +4793,7 @@ ROM_START( psyvar2 ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-5100-JPN) //(sticker 253-5509-5100J) - ROM_LOAD("317-5100-jpn.pic", 0x00, 0x4000, CRC(f37a1dbe) SHA1(a0b43069c9ecd5633418404344b7750db5371ac4) ) + ROM_LOAD("317-5100-jpn.pic", 0x00, 0x4000, CRC(f37a1dbe) SHA1(a0b43069c9ecd5633418404344b7750db5371ac4) ) ROM_END @@ -4833,7 +4833,7 @@ ROM_START( trizeal ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-5103-JPN) //(sticker 253-5509-5103J) - ROM_LOAD("317-5103-jpn.pic", 0x00, 0x4000, CRC(93feaff4) SHA1(0b362e9794c83b43e23a3d7299ff0b69f4740481) ) + ROM_LOAD("317-5103-jpn.pic", 0x00, 0x4000, CRC(93feaff4) SHA1(0b362e9794c83b43e23a3d7299ff0b69f4740481) ) ROM_END @@ -4848,11 +4848,11 @@ ROM_START( meltybld ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) //ROM_LOAD("317-5104-jpn.data", 0x00, 0x50, CRC(fedc8305) SHA1(c535545937213f726f25e6aa8eb3746a794e9100) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5104-JPN) //(sticker 253-5509-5104J) - ROM_LOAD("317-5104-jpn.pic", 0x00, 0x4000, CRC(afa5e709) SHA1(c107f6c5b7574f2c7e7ac6ed1fcc37edabdc95e8) ) + ROM_LOAD("317-5104-jpn.pic", 0x00, 0x4000, CRC(afa5e709) SHA1(c107f6c5b7574f2c7e7ac6ed1fcc37edabdc95e8) ) ROM_END @@ -4871,7 +4871,7 @@ ROM_START( senko ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5107-JPN) //(sticker 253-5509-5107J) - ROM_LOAD("317-5107-jpn.pic", 0x00, 0x4000, CRC(6bc3fad0) SHA1(6d5196265232f4c0715a97acc84d6f7376056894) ) + ROM_LOAD("317-5107-jpn.pic", 0x00, 0x4000, CRC(6bc3fad0) SHA1(6d5196265232f4c0715a97acc84d6f7376056894) ) ROM_END ROM_START( senkoo ) @@ -4889,7 +4889,7 @@ ROM_START( senkoo ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5107-JPN) //(sticker 253-5509-5107J) - ROM_LOAD("317-5107-jpn.pic", 0x00, 0x4000, CRC(6bc3fad0) SHA1(6d5196265232f4c0715a97acc84d6f7376056894) ) + ROM_LOAD("317-5107-jpn.pic", 0x00, 0x4000, CRC(6bc3fad0) SHA1(6d5196265232f4c0715a97acc84d6f7376056894) ) ROM_END @@ -4908,7 +4908,7 @@ ROM_START( ss2005 ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5108-JPN) //(sticker 253-5509-5108J) - ROM_LOAD("317-5108-jpn.pic", 0x00, 0x4000, CRC(4fa7dede) SHA1(f9011e951378364a12512d398f76be174dccce69) ) + ROM_LOAD("317-5108-jpn.pic", 0x00, 0x4000, CRC(4fa7dede) SHA1(f9011e951378364a12512d398f76be174dccce69) ) ROM_END @@ -4927,7 +4927,7 @@ ROM_START( radirgy ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-5110-JPN) //(sticker 253-5509-5110J) - ROM_LOAD("317-5110-jpn.pic", 0x00, 0x4000, CRC(829d06e2) SHA1(c53d791e82cc75f2bcd49575185c89d448fed672) ) + ROM_LOAD("317-5110-jpn.pic", 0x00, 0x4000, CRC(829d06e2) SHA1(c53d791e82cc75f2bcd49575185c89d448fed672) ) ROM_END @@ -4942,12 +4942,12 @@ ROM_START( ggxxsla ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) //ROM_LOAD("317-5111-jpn.data", 0x00, 0x50, CRC(a517c70d) SHA1(5f9798941355fb9abce511508c860653d6369e72) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-5111-JPN) //(sticker 253-5509-5111J) - ROM_LOAD("317-5111-jpn.pic", 0x00, 0x4000, CRC(96bcbd42) SHA1(af4efdf2a02920af9885d104091da0584fca988c) ) + ROM_LOAD("317-5111-jpn.pic", 0x00, 0x4000, CRC(96bcbd42) SHA1(af4efdf2a02920af9885d104091da0584fca988c) ) ROM_END @@ -4966,7 +4966,7 @@ ROM_START( kurucham ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-5115-JPN) //(sticker 253-5509-5115J) - ROM_LOAD("317-5115-jpn.pic", 0x00, 0x4000, CRC(e5435e85) SHA1(9d5b25de82284e5fcab2cbf7fb73669d1130648a) ) + ROM_LOAD("317-5115-jpn.pic", 0x00, 0x4000, CRC(e5435e85) SHA1(9d5b25de82284e5fcab2cbf7fb73669d1130648a) ) ROM_END @@ -4985,7 +4985,7 @@ ROM_START( undefeat ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5117-JPN) //(sticker 253-5509-5117J) - ROM_LOAD("317-5117-jpn.pic", 0x00, 0x4000, CRC(61e65ca8) SHA1(f1a242d3dd1af0df084dd1568320f6b4c51d9e20) ) + ROM_LOAD("317-5117-jpn.pic", 0x00, 0x4000, CRC(61e65ca8) SHA1(f1a242d3dd1af0df084dd1568320f6b4c51d9e20) ) ROM_END @@ -5004,7 +5004,7 @@ ROM_START( meltyb ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5124-JPN) //(sticker 253-5509-5124J) - ROM_LOAD("317-5124-jpn.pic", 0x00, 0x4000, CRC(ad162bfa) SHA1(0e9740ba65a724eb7cd70fb897e5cd9ac17aa55c) ) + ROM_LOAD("317-5124-jpn.pic", 0x00, 0x4000, CRC(ad162bfa) SHA1(0e9740ba65a724eb7cd70fb897e5cd9ac17aa55c) ) ROM_END ROM_START( meltyba ) @@ -5022,7 +5022,7 @@ ROM_START( meltyba ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5124-JPN) //(sticker 253-5509-5124J) - ROM_LOAD("317-5124-jpn.pic", 0x00, 0x4000, CRC(ad162bfa) SHA1(0e9740ba65a724eb7cd70fb897e5cd9ac17aa55c) ) + ROM_LOAD("317-5124-jpn.pic", 0x00, 0x4000, CRC(ad162bfa) SHA1(0e9740ba65a724eb7cd70fb897e5cd9ac17aa55c) ) ROM_END @@ -5041,7 +5041,7 @@ ROM_START( trgheart ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5121-JPN) //(sticker 253-5509-5121J) - ROM_LOAD("317-5121-jpn.pic", 0x00, 0x4000, CRC(cdb9b179) SHA1(8f7d1e9a99ad90344449c6ebb623e2968f611ec0) ) + ROM_LOAD("317-5121-jpn.pic", 0x00, 0x4000, CRC(cdb9b179) SHA1(8f7d1e9a99ad90344449c6ebb623e2968f611ec0) ) ROM_END @@ -5061,7 +5061,7 @@ ROM_START( jingystm ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-5122-JPN) //(sticker 253-5509-5122J) - ROM_LOAD("317-5122-jpn.pic", 0x00, 0x4000, CRC(88983220) SHA1(410ee292794c44d2249778c8b6adda023286eb04) ) + ROM_LOAD("317-5122-jpn.pic", 0x00, 0x4000, CRC(88983220) SHA1(410ee292794c44d2249778c8b6adda023286eb04) ) ROM_END @@ -5076,7 +5076,7 @@ ROM_START( karous ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) //ROM_LOAD("317-5125-com.data", 0x00, 0x50, CRC(9d37b5e3) SHA1(e1d3cdc2ed82c864c9ff54d9399a80b70ba150c5) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-5125-COM) //(sticker 253-5509-5125) @@ -5158,7 +5158,7 @@ ROM_START( sprtjam ) //ROM_LOAD("317-0300-com.data", 0x00, 0x50, CRC(9a08413f) SHA1(d57649dcc3af578d55a93dd7a3f41da62d580f54) ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) - ROM_LOAD("317-0300-com.pic", 0x00, 0x4000, CRC(19a97214) SHA1(bcee1af2c16daabc7a0f723e1f9281a7c95600c6) ) + ROM_LOAD("317-0300-com.pic", 0x00, 0x4000, CRC(19a97214) SHA1(bcee1af2c16daabc7a0f723e1f9281a7c95600c6) ) ROM_END @@ -5232,7 +5232,7 @@ ROM_START( monkeyba ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) //ROM_LOAD("317-0307-com.data", 0x00, 0x50, CRC(448bedc7) SHA1(092dbe5e28890d3ee40d62ca8cbf225c3ce90304) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) ROM_LOAD("317-0307-com.pic", 0x00, 0x4000, CRC(4046de19) SHA1(8adda9f223e926148b36744bbbaa89557544a229) ) ROM_END @@ -5280,7 +5280,7 @@ ROM_START( dygolf ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) //ROM_LOAD("317-0308-com.data", 0x00, 0x50, CRC(56f63af0) SHA1(3c453226fc53d2f700b3634db3ef8ce206d94392) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-0308-COM) //(sticker 253-5508-0308) @@ -5414,7 +5414,7 @@ ROM_START( lupinsho ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) //ROM_LOAD("317-0332-j.data", 0x00, 0x50, CRC(31f2b632) SHA1(bbf253bfe831308a7e7fde3a4a28e5bcd2fbb273) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) ROM_LOAD("317-0332-j.pic", 0x00, 0x4000, CRC(f71cb2fc) SHA1(281b3b3b03edf9a39e380976de528b7c9674de53) ) ROM_END @@ -5436,7 +5436,7 @@ ROM_START( luptype ) //PIC16C622A (317-0332-JPN) //(sticker 253-5508-0332J) ROM_LOAD("317-0332-jpn.pic", 0x00, 0x4000, CRC(43e78ecf) SHA1(bbe4b036e965fbba6ab79c88cba4ea8f0ea3f9fc) ) - + ROM_END /* @@ -5472,7 +5472,7 @@ ROM_START( mok ) ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE) //ROM_LOAD("317-0333-com.data", 0x00, 0x50, CRC(0c07970f) SHA1(8882dd2f8ed522790ea78eed80cfa9442f88f67b) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) ROM_LOAD("317-0333-com.pic", 0x00, 0x4000, CRC(15fb7792) SHA1(03932ba9b1738d5ab75b2a465cc3254e75f59f63) ) @@ -5495,7 +5495,7 @@ ROM_START( ngdup23a ) //PIC16C622A (317-0314-COM) //(sticker 253-5508-0314) ROM_LOAD("317-0314-com.pic", 0x00, 0x4000, CRC(fa0b6c70) SHA1(c29936cb18e1dd592563b1104281f031e3b12fc2) ) - + ROM_END ROM_START( ngdup23c ) @@ -5532,7 +5532,7 @@ ROM_START( puyofev ) ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C621A (317-0375-COM) //(sticker 253-5508-0375) - ROM_LOAD("317-0375-com.pic", 0x00, 0x4000, CRC(52b56b52) SHA1(221590efbb09824621714cb163bda51a921d7d54) ) + ROM_LOAD("317-0375-com.pic", 0x00, 0x4000, CRC(52b56b52) SHA1(221590efbb09824621714cb163bda51a921d7d54) ) ROM_END @@ -5715,7 +5715,7 @@ ROM_START( vf4cart ) ROM_END /* - Tests IC1 like gram2000 if actel_id is 0xffff, see ROM_COPY + Tests IC1 like gram2000 if actel_id is 0xffff, see ROM_COPY */ ROM_START( vf4evoct ) NAOMI2_BIOS @@ -6014,7 +6014,7 @@ ROM_START( initd ) //ROM_REGION( 0x9a49, "pichex", ROMREGION_ERASE) // actual pic dump (in hex/ascii mode) from decap //ROM_LOAD("gds-0020b.hex", 0x00, 0x0009a49, CRC(80d9fe04) SHA1(7a6fe325ce2e12e9270205d32f549aaf66505de5) ) - + ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) //PIC16C622A (317-0331-JPN) //(sticker 253-5508-0331J) diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c index 23b1c8376d4..f8565133723 100644 --- a/src/mame/drivers/nemesis.c +++ b/src/mame/drivers/nemesis.c @@ -67,12 +67,12 @@ static INTERRUPT_GEN( konamigt_interrupt ) if (cpu_getiloops(device) == 0) { - if ((state->irq_on) && (state->gx400_irq1_cnt++ & 1)) + if ((state->irq_on) && (state->gx400_irq1_cnt++ & 1)) cpu_set_input_line(device, 1, HOLD_LINE); } else { - if (state->irq2_on) + if (state->irq2_on) cpu_set_input_line(device, 2, HOLD_LINE); } } @@ -84,17 +84,17 @@ static INTERRUPT_GEN( gx400_interrupt ) switch (cpu_getiloops(device)) { case 0: - if (state->irq2_on) + if (state->irq2_on) cpu_set_input_line(device, 2, HOLD_LINE); break; case 1: - if ((state->irq1_on) && (state->gx400_irq1_cnt++ & 1)) + if ((state->irq1_on) && (state->gx400_irq1_cnt++ & 1)) cpu_set_input_line(device, 1, HOLD_LINE); break; case 2: - if (state->irq4_on) + if (state->irq4_on) cpu_set_input_line(device, 4, HOLD_LINE); break; } @@ -212,10 +212,10 @@ static READ16_HANDLER( konamigt_input_word_r ) // if (BIT(data, 4)) ret |= 0x0800; // turbo/gear? // if (BIT(data, 7)) ret |= 0x0400; // turbo? - if (BIT(data, 5)) + if (BIT(data, 5)) ret |= 0x0300; // brake (0-3) - if (BIT(data, 6)) + if (BIT(data, 6)) ret |= 0xf000; // accel (0-f) ret |= data2 & 0x7f; // steering wheel, not exactly sure if DIAL works ok. @@ -227,7 +227,7 @@ static WRITE16_HANDLER( selected_ip_word_w ) { nemesis_state *state = (nemesis_state *)space->machine->driver_data; - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) state->selected_ip = data & 0xff; // latch the value } diff --git a/src/mame/drivers/nightgal.c b/src/mame/drivers/nightgal.c index 53c9a50cf9c..ebfa74abc9f 100644 --- a/src/mame/drivers/nightgal.c +++ b/src/mame/drivers/nightgal.c @@ -135,9 +135,9 @@ static WRITE8_HANDLER( nsc_true_blitter_w ) // lowest bit of src controls flipping / draw direction? flipx = (state->true_blit[0] & 1); - if (!flipx) + if (!flipx) src += (w * h) - 1; - else + else src -= (w * h) - 1; { @@ -158,9 +158,9 @@ static WRITE8_HANDLER( nsc_true_blitter_w ) if ((dat & 0xff) != 0) plot_nightgal_gfx_pixel(space->machine, dat, drawx, drawy); - if (!flipx) + if (!flipx) count--; - else + else count++; } } @@ -191,9 +191,9 @@ static WRITE8_HANDLER( sexygal_nsc_true_blitter_w ) // lowest bit of src controls flipping / draw direction? flipx = (state->true_blit[0] & 1); - if (!flipx) + if (!flipx) src += (w * h) - 1; - else + else src -= (w * h) - 1; { @@ -214,9 +214,9 @@ static WRITE8_HANDLER( sexygal_nsc_true_blitter_w ) if ((dat & 0xff) != 0) plot_nightgal_gfx_pixel(space->machine, dat, drawx, drawy); - if (!flipx) + if (!flipx) count--; - else + else count++; } } @@ -758,7 +758,7 @@ static MACHINE_RESET( nightgal ) state->nsc_latch = 0; state->z80_latch = 0; state->mux_data = 0; - + memset(state->blit_raw_data, 0, ARRAY_LENGTH(state->blit_raw_data)); memset(state->true_blit, 0, ARRAY_LENGTH(state->true_blit)); memset(state->pen_data, 0, ARRAY_LENGTH(state->pen_data)); diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c index 61e19c6f602..c4df333d28f 100644 --- a/src/mame/drivers/nmg5.c +++ b/src/mame/drivers/nmg5.c @@ -826,7 +826,7 @@ INPUT_PORTS_END INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int tile_index, UINT16 *vram, int color ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; SET_TILE_INFO(0, vram[tile_index] | (state->gfx_bank << 16), color, 0); } @@ -835,7 +835,7 @@ static TILE_GET_INFO( bg_get_tile_info ) { nmg5_state *state = (nmg5_state *)mac static VIDEO_START( nmg5 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; state->bg_tilemap = tilemap_create(machine, bg_get_tile_info, tilemap_scan_rows, 8, 8, 64, 64); state->fg_tilemap = tilemap_create(machine, fg_get_tile_info, tilemap_scan_rows, 8, 8, 64, 64); @@ -844,7 +844,7 @@ static VIDEO_START( nmg5 ) static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; UINT16 *spriteram = state->spriteram; int offs; @@ -880,7 +880,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect static void draw_bitmap( running_machine *machine, bitmap_t *bitmap ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; int yyy = 256; int xxx = 512 / 4; UINT16 x, y, count; @@ -999,7 +999,7 @@ GFXDECODE_END static void soundirq( running_device *device, int state ) { - nmg5_state *driver_state = (nmg5_state *)device->machine->driver_data; + nmg5_state *driver_state = (nmg5_state *)device->machine->driver_data; cpu_set_input_line(driver_state->soundcpu, 0, state); } @@ -1010,7 +1010,7 @@ static const ym3812_interface ym3812_intf = static MACHINE_START( nmg5 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; state->maincpu = devtag_get_device(machine, "maincpu"); state->soundcpu = devtag_get_device(machine, "soundcpu"); @@ -1022,7 +1022,7 @@ static MACHINE_START( nmg5 ) static MACHINE_RESET( nmg5 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; /* some games don't set the priority register so it should be hard-coded to a normal layout */ state->priority_reg = 7; @@ -1528,25 +1528,25 @@ ROM_END static DRIVER_INIT( prot_val_00 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; state->prot_val = 0x00; } static DRIVER_INIT( prot_val_10 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; state->prot_val = 0x10; } static DRIVER_INIT( prot_val_20 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; state->prot_val = 0x20; } static DRIVER_INIT( prot_val_40 ) { - nmg5_state *state = (nmg5_state *)machine->driver_data; + nmg5_state *state = (nmg5_state *)machine->driver_data; state->prot_val = 0x40; } diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c index 5323622cfc1..9afd80104ae 100644 --- a/src/mame/drivers/nycaptor.c +++ b/src/mame/drivers/nycaptor.c @@ -235,9 +235,9 @@ static MACHINE_RESET( ta7630 ) static TIMER_CALLBACK( nmi_callback ) { nycaptor_state *state = (nycaptor_state *)machine->driver_data; - if (state->sound_nmi_enable) + if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); - else + else state->pending_nmi = 1; } diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index 29eca6b9cc0..c9b7fd0342d 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -87,7 +87,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nyny_state(machine)); } nyny_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram1; UINT8 * videoram2; diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c index 921c3035a55..819d896e5bc 100644 --- a/src/mame/drivers/ojankohs.c +++ b/src/mame/drivers/ojankohs.c @@ -50,7 +50,7 @@ static WRITE8_HANDLER( ojankoy_rombank_w ) memory_set_bank(space->machine, "bank1", data & 0x1f); state->adpcm_reset = BIT(data, 5); - if (!state->adpcm_reset) + if (!state->adpcm_reset) state->vclk_left = 0; msm5205_reset_w(state->msm, !state->adpcm_reset); @@ -81,7 +81,7 @@ static void ojankohs_adpcm_int( running_device *device ) return; /* clock the data through */ - if (state->vclk_left) + if (state->vclk_left) { msm5205_data_w(device, (state->adpcm_data >> 4)); state->adpcm_data <<= 4; @@ -115,7 +115,7 @@ static READ8_HANDLER( ojankohs_keymatrix_r ) ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; int ret; - switch (state->portselect) + switch (state->portselect) { case 0x01: ret = input_port_read(space->machine, "KEY0"); break; case 0x02: ret = input_port_read(space->machine, "KEY1"); break; @@ -149,7 +149,7 @@ static READ8_HANDLER( ojankoc_keymatrix_r ) { "KEY5", "KEY6", "KEY7", "KEY8", "KEY9" } }; - for (i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { if (!BIT(state->portselect, i)) ret |= input_port_read(space->machine, keynames[offset][i]); diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c index e65e31086f8..21d3f3a8d7b 100644 --- a/src/mame/drivers/olibochu.c +++ b/src/mame/drivers/olibochu.c @@ -62,7 +62,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, olibochu_state(machine)); } olibochu_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; @@ -234,9 +234,9 @@ static WRITE8_HANDLER( sound_command_w ) olibochu_state *state = (olibochu_state *)space->machine->driver_data; int c; - if (offset == 0) + if (offset == 0) state->cmd = (state->cmd & 0x00ff) | (data << 8); - else + else state->cmd = (state->cmd & 0xff00) | data; for (c = 15; c >= 0; c--) diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c index d34d939c812..aaf741833e5 100644 --- a/src/mame/drivers/onetwo.c +++ b/src/mame/drivers/onetwo.c @@ -52,7 +52,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, onetwo_state(machine)); } onetwo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * fgram; UINT8 * paletteram; diff --git a/src/mame/drivers/othello.c b/src/mame/drivers/othello.c index 9da793b9525..ca886f12f85 100644 --- a/src/mame/drivers/othello.c +++ b/src/mame/drivers/othello.c @@ -53,7 +53,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, othello_state(machine)); } othello_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; @@ -64,7 +64,7 @@ public: int ay_select; int ack_data; UINT8 n7751_command; -// UINT32 n7751_rom_address; +// UINT32 n7751_rom_address; int sound_addr; int n7751_busy; diff --git a/src/mame/drivers/poo.c b/src/mame/drivers/poo.c index 58c65870347..4ba39aee43d 100644 --- a/src/mame/drivers/poo.c +++ b/src/mame/drivers/poo.c @@ -360,7 +360,7 @@ static MACHINE_DRIVER_START( unclepoo ) MDRV_CPU_ADD("subcpu", Z80,18000000/12) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(unclepoo_sub_map) MDRV_CPU_IO_MAP(unclepoo_sub_portmap) -// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) +// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c index 880a2bc7b3f..cbcdfe15ef9 100644 --- a/src/mame/drivers/pushman.c +++ b/src/mame/drivers/pushman.c @@ -16,7 +16,7 @@ with a 68705 for protection. Pushman is known to be released in a 2 PCB stack as well as a large - single plane board. + single plane board. ************************************************************************** diff --git a/src/mame/drivers/rgum.c b/src/mame/drivers/rgum.c index a26e0761b7e..c48433fba15 100644 --- a/src/mame/drivers/rgum.c +++ b/src/mame/drivers/rgum.c @@ -50,7 +50,7 @@ static MACHINE_DRIVER_START( rgum ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", Z80,8000000) /* ? MHz */ MDRV_CPU_PROGRAM_MAP(rgum_map) -// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) +// MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/safarir.c b/src/mame/drivers/safarir.c index 3cad7580b92..fc51bd4a111 100644 --- a/src/mame/drivers/safarir.c +++ b/src/mame/drivers/safarir.c @@ -56,7 +56,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, safarir_state(machine)); } safarir_state(running_machine &machine) { } - + UINT8 *ram_1, *ram_2; size_t ram_size; UINT8 ram_bank; diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c index 9bc81d9fb9c..50e9cd7917e 100644 --- a/src/mame/drivers/sbowling.c +++ b/src/mame/drivers/sbowling.c @@ -51,7 +51,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sbowling_state(machine)); } sbowling_state(running_machine &machine) { } - + int bgmap; UINT8 *videoram; diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index e51e76e179d..8b50e5a0de0 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -96,7 +96,7 @@ Graphics: HM86171 Sound: OKI M6295 Other: XILINX XC9536XL (socketted) -HM86171-120 - HMC 28 pin DIP Color Pallete RAMDAC +HM86171-120 - HMC 28 pin DIP Color Pallete RAMDAC ULN2003A - 16 pin DIP Seven Darlington Arrays 51864 - V62C51864L-35P 64Kb SRAM 75176 - SN75176BP Differential BUS Transceiver (Bidirectional data communication on multipoint bus transmission line) @@ -190,7 +190,7 @@ Graphics: HM86171 Sound: OKI M6295 Other: XILINX XC9536XL (used for programable protection, connected to H2) -HM86171-120 - HMC 28 pin DIP Color Pallete RAMDAC +HM86171-120 - HMC 28 pin DIP Color Pallete RAMDAC FM1608-120 - RAMTRON 64Kb bytewide Ferroelectric Nonvolatile RAM ULN2003A - 16 pin DIP Seven Darlington Arrays 75176 - SN75176BP Differential BUS Transceiver (Bidirectional data communication on multipoint bus transmission line) diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c index 6ec88c2a924..59d198629be 100644 --- a/src/mame/drivers/shougi.c +++ b/src/mame/drivers/shougi.c @@ -93,7 +93,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shougi_state(machine)); } shougi_state(running_machine &machine) { } - + UINT8 *videoram; int nmi_enabled; //UINT8 *cpu_sharedram; diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index aed3d7fbb63..28eacd6bf49 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -1066,7 +1066,7 @@ static DRIVER_INIT( simpl156 ) static READ32_HANDLER( joemacr_speedup_r ) { simpl156_state *state = (simpl156_state *)space->machine->driver_data; - if (cpu_get_pc(space->cpu) == 0x284) + if (cpu_get_pc(space->cpu) == 0x284) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0x18/4]; } @@ -1081,7 +1081,7 @@ static DRIVER_INIT( joemacr ) static READ32_HANDLER( chainrec_speedup_r ) { simpl156_state *state = (simpl156_state *)space->machine->driver_data; - if (cpu_get_pc(space->cpu) == 0x2d4) + if (cpu_get_pc(space->cpu) == 0x2d4) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0x18/4]; } @@ -1095,7 +1095,7 @@ static DRIVER_INIT( chainrec ) static READ32_HANDLER( prtytime_speedup_r ) { simpl156_state *state = (simpl156_state *)space->machine->driver_data; - if (cpu_get_pc(space->cpu) == 0x4f0) + if (cpu_get_pc(space->cpu) == 0x4f0) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0xae0/4]; } @@ -1110,7 +1110,7 @@ static DRIVER_INIT( prtytime ) static READ32_HANDLER( charlien_speedup_r ) { simpl156_state *state = (simpl156_state *)space->machine->driver_data; - if (cpu_get_pc(space->cpu) == 0xc8c8) + if (cpu_get_pc(space->cpu) == 0xc8c8) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0x10/4]; } @@ -1124,7 +1124,7 @@ static DRIVER_INIT( charlien ) static READ32_HANDLER( osman_speedup_r ) { simpl156_state *state = (simpl156_state *)space->machine->driver_data; - if (cpu_get_pc(space->cpu) == 0x5974) + if (cpu_get_pc(space->cpu) == 0x5974) cpu_spinuntil_time(space->cpu, ATTOTIME_IN_USEC(400)); return state->systemram[0x10/4]; } diff --git a/src/mame/drivers/skeetsht.c b/src/mame/drivers/skeetsht.c index 7e7017c2fc8..1bba846262a 100644 --- a/src/mame/drivers/skeetsht.c +++ b/src/mame/drivers/skeetsht.c @@ -23,7 +23,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skeetsht_state(machine)); } skeetsht_state(running_machine &machine) { } - + UINT16 *tms_vram; UINT8 porta_latch; UINT8 ay_sel; diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 1858825de67..c893a90db08 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -30,7 +30,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skyarmy_state(machine)); } skyarmy_state(running_machine &machine) { } - + UINT8 *spriteram; UINT8 *videoram; UINT8 *colorram; diff --git a/src/mame/drivers/sliver.c b/src/mame/drivers/sliver.c index 9f8493e6c7a..c8c589a08ec 100644 --- a/src/mame/drivers/sliver.c +++ b/src/mame/drivers/sliver.c @@ -82,7 +82,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sliver_state(machine)); } sliver_state(running_machine &machine) { } - + UINT16 io_offset; UINT16 io_reg[IO_SIZE]; UINT16 fifo[FIFO_SIZE]; diff --git a/src/mame/drivers/spaceg.c b/src/mame/drivers/spaceg.c index 65aea202bd1..4343f4985ab 100644 --- a/src/mame/drivers/spaceg.c +++ b/src/mame/drivers/spaceg.c @@ -179,7 +179,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spaceg_state(machine)); } spaceg_state(running_machine &machine) { } - + UINT8 * videoram; UINT8 * unkram; UINT8 * io9400; diff --git a/src/mame/drivers/spoker.c b/src/mame/drivers/spoker.c index baf5ab43aee..54361479019 100644 --- a/src/mame/drivers/spoker.c +++ b/src/mame/drivers/spoker.c @@ -24,7 +24,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spoker_state(machine)); } spoker_state(running_machine &machine) { } - + UINT8 *bg_tile_ram; tilemap_t *bg_tilemap; diff --git a/src/mame/drivers/spool99.c b/src/mame/drivers/spool99.c index f781dab34d2..a06e2b3a48d 100644 --- a/src/mame/drivers/spool99.c +++ b/src/mame/drivers/spool99.c @@ -98,7 +98,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spool99_state(machine)); } spool99_state(running_machine &machine) { } - + UINT8 *main; tilemap_t *sc0_tilemap; UINT8 *cram; diff --git a/src/mame/drivers/srmp5.c b/src/mame/drivers/srmp5.c index b6d3f40c281..3d4f1277924 100644 --- a/src/mame/drivers/srmp5.c +++ b/src/mame/drivers/srmp5.c @@ -68,7 +68,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp5_state(machine)); } srmp5_state(running_machine &machine) { } - + UINT32 databank; UINT16 *tileram; UINT16 *palram; diff --git a/src/mame/drivers/srmp6.c b/src/mame/drivers/srmp6.c index 2af1f92159b..5b575a26426 100644 --- a/src/mame/drivers/srmp6.c +++ b/src/mame/drivers/srmp6.c @@ -77,7 +77,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp6_state(machine)); } srmp6_state(running_machine &machine) { } - + UINT16* tileram; UINT16* dmaram; diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c index 260b17b2146..7e314c04d75 100644 --- a/src/mame/drivers/ssingles.c +++ b/src/mame/drivers/ssingles.c @@ -156,7 +156,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ssingles_state(machine)); } ssingles_state(running_machine &machine) { } - + UINT8 *videoram; UINT8 *colorram; UINT8 prot_data; diff --git a/src/mame/drivers/sstrangr.c b/src/mame/drivers/sstrangr.c index 23764df96c6..93abe39bdd0 100644 --- a/src/mame/drivers/sstrangr.c +++ b/src/mame/drivers/sstrangr.c @@ -18,7 +18,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sstrangr_state(machine)); } sstrangr_state(running_machine &machine) { } - + UINT8 *ram; UINT8 flip_screen; UINT8 *proms; diff --git a/src/mame/drivers/sub.c b/src/mame/drivers/sub.c index 747a16d2e11..5a5940377f6 100644 --- a/src/mame/drivers/sub.c +++ b/src/mame/drivers/sub.c @@ -118,7 +118,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sub_state(machine)); } sub_state(running_machine &machine) { } - + UINT8* vid; UINT8* attr; UINT8* scrolly; diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c index db4d1ce0be7..35bd2afae18 100644 --- a/src/mame/drivers/supdrapo.c +++ b/src/mame/drivers/supdrapo.c @@ -39,7 +39,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supdrapo_state(machine)); } supdrapo_state(running_machine &machine) { } - + UINT8 *char_bank; UINT8 *col_line; UINT8 *videoram; diff --git a/src/mame/drivers/superdq.c b/src/mame/drivers/superdq.c index 5e49d3f92b6..b014480f85b 100644 --- a/src/mame/drivers/superdq.c +++ b/src/mame/drivers/superdq.c @@ -33,7 +33,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, superdq_state(machine)); } superdq_state(running_machine &machine) { } - + running_device *laserdisc; UINT8 ld_in_latch; UINT8 ld_out_latch; diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c index fb8f5b5d11f..bfda60836ca 100644 --- a/src/mame/drivers/supertnk.c +++ b/src/mame/drivers/supertnk.c @@ -111,7 +111,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, supertnk_state(machine)); } supertnk_state(running_machine &machine) { } - + UINT8 *videoram[3]; UINT8 rom_bank; UINT8 bitplane_select; diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 26187620da7..7009a90145f 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -30,7 +30,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, suprgolf_state(machine)); } suprgolf_state(running_machine &machine) { } - + tilemap_t *tilemap; UINT8 *videoram; UINT8 *paletteram; diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index d013505d974..28553a7d45c 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -129,7 +129,7 @@ Stephh's notes (based on the games M68000 and Z80 code and some tests) : 3) 'hellfire' and "clones" TO DO ! - + 4) 'zerowing' and "clones" @@ -642,7 +642,7 @@ static INPUT_PORTS_START( truxton ) /* in 0x50 (CPU1) -> 0x8004 (CPU1 shared RAM) = 0x180008.w (CPU0 shared RAM) -> 0x081b7a.w */ PORT_START("DSWB") TOAPLAN_DIFFICULTY - PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Bonus_Life ) ) /* table at 0x000930 */ + PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Bonus_Life ) ) /* table at 0x000930 */ PORT_DIPSETTING( 0x04, "50k 200k 150k+" ) PORT_DIPSETTING( 0x00, "70k 270k 200k+" ) PORT_DIPSETTING( 0x08, "100k Only" ) @@ -663,11 +663,11 @@ static INPUT_PORTS_START( truxton ) PORT_START("TJUMP") /* Territory Jumper Block - see notes */ PORT_DIPNAME( 0x07, 0x02, "Territory/Copyright" ) PORT_DIPSETTING( 0x02, "Europe/Taito Corp" ) /* TOAPLAN_COINAGE_WORLD */ -// PORT_DIPSETTING( 0x03, "Europe/Taito Corp" ) /* TOAPLAN_COINAGE_JAPAN_OLD */ -// PORT_DIPSETTING( 0x06, "Europe/Taito America" ) /* TOAPLAN_COINAGE_WORLD */ -// PORT_DIPSETTING( 0x07, "Europe/Taito America" ) /* TOAPLAN_COINAGE_JAPAN_OLD */ +// PORT_DIPSETTING( 0x03, "Europe/Taito Corp" ) /* TOAPLAN_COINAGE_JAPAN_OLD */ +// PORT_DIPSETTING( 0x06, "Europe/Taito America" ) /* TOAPLAN_COINAGE_WORLD */ +// PORT_DIPSETTING( 0x07, "Europe/Taito America" ) /* TOAPLAN_COINAGE_JAPAN_OLD */ PORT_DIPSETTING( 0x04, "USA/Taito America" ) /* TOAPLAN_COINAGE_JAPAN_OLD */ -// PORT_DIPSETTING( 0x05, "USA/Taito America" ) /* TOAPLAN_COINAGE_JAPAN_OLD */ +// PORT_DIPSETTING( 0x05, "USA/Taito America" ) /* TOAPLAN_COINAGE_JAPAN_OLD */ PORT_DIPSETTING( 0x01, "USA/Taito America (Romstar)" )/*TOAPLAN_COINAGE_JAPAN_OLD */ PORT_DIPSETTING( 0x00, "Japan/Taito Corp" ) /* TOAPLAN_COINAGE_JAPAN_OLD */ PORT_DIPUNUSED( 0x08, IP_ACTIVE_HIGH ) diff --git a/src/mame/drivers/toratora.c b/src/mame/drivers/toratora.c index 042e73959cb..14ffbf5a578 100644 --- a/src/mame/drivers/toratora.c +++ b/src/mame/drivers/toratora.c @@ -29,7 +29,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toratora_state(machine)); } toratora_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c index ae016b0aaaf..a7bd5c9307c 100644 --- a/src/mame/drivers/twincobr.c +++ b/src/mame/drivers/twincobr.c @@ -473,12 +473,12 @@ static INPUT_PORTS_START( skyshark ) PORT_DIPSETTING( 0x10, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x20, DEF_STR( 1C_2C ) ) -// PORT_DIPSETTING( 0x30, DEF_STR( 1C_2C ) ) /* duplicated setting */ +// PORT_DIPSETTING( 0x30, DEF_STR( 1C_2C ) ) /* duplicated setting */ PORT_DIPNAME( 0xc0, 0x00, DEF_STR( Coin_B ) ) /* table at 0x000316 */ PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 1C_2C ) ) -// PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) /* duplicated setting */ +// PORT_DIPSETTING( 0xc0, DEF_STR( 1C_2C ) ) /* duplicated setting */ INPUT_PORTS_END /* verified from M68000 code */ diff --git a/src/mame/includes/1942.h b/src/mame/includes/1942.h index 393495c6839..f80856377e9 100644 --- a/src/mame/includes/1942.h +++ b/src/mame/includes/1942.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _1942_state(machine)); } _1942_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * fg_videoram; UINT8 * bg_videoram; diff --git a/src/mame/includes/1943.h b/src/mame/includes/1943.h index 28573a88d56..137661aa04c 100644 --- a/src/mame/includes/1943.h +++ b/src/mame/includes/1943.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _1943_state(machine)); } _1943_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/20pacgal.h b/src/mame/includes/20pacgal.h index 5f1a7895ade..27ac184f76e 100644 --- a/src/mame/includes/20pacgal.h +++ b/src/mame/includes/20pacgal.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _20pacgal_state(machine)); } _20pacgal_state(running_machine &machine) { } - + /* memory pointers */ UINT8 *char_gfx_ram; UINT8 *sprite_gfx_ram; diff --git a/src/mame/includes/88games.h b/src/mame/includes/88games.h index e2c0acf6ed3..e3768d7d45f 100644 --- a/src/mame/includes/88games.h +++ b/src/mame/includes/88games.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, _88games_state(machine)); } _88games_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; UINT8 * banked_rom; diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index b8df84b17dd..54102cf118c 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, actfancr_state(machine)); } actfancr_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * pf1_data; UINT8 * pf2_data; diff --git a/src/mame/includes/aeroboto.h b/src/mame/includes/aeroboto.h index 17b6300c008..a745475cc7b 100644 --- a/src/mame/includes/aeroboto.h +++ b/src/mame/includes/aeroboto.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aeroboto_state(machine)); } aeroboto_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * mainram; UINT8 * spriteram; diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index 78b81858771..f95640fde49 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aerofgt_state(machine)); } aerofgt_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg1videoram; UINT16 * bg2videoram; diff --git a/src/mame/includes/airbustr.h b/src/mame/includes/airbustr.h index be0cb4bbd5a..af1bc34f5c4 100644 --- a/src/mame/includes/airbustr.h +++ b/src/mame/includes/airbustr.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, airbustr_state(machine)); } airbustr_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/includes/ajax.h b/src/mame/includes/ajax.h index 8ef90ec805f..f561f3d2baa 100644 --- a/src/mame/includes/ajax.h +++ b/src/mame/includes/ajax.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ajax_state(machine)); } ajax_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/aliens.h b/src/mame/includes/aliens.h index 6efe0fc8795..cbfcb6886b9 100644 --- a/src/mame/includes/aliens.h +++ b/src/mame/includes/aliens.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aliens_state(machine)); } aliens_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/alpha68k.h b/src/mame/includes/alpha68k.h index 399f06293a7..21891997107 100644 --- a/src/mame/includes/alpha68k.h +++ b/src/mame/includes/alpha68k.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, alpha68k_state(machine)); } alpha68k_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * spriteram; diff --git a/src/mame/includes/ambush.h b/src/mame/includes/ambush.h index 674427774f9..57eb552f513 100644 --- a/src/mame/includes/ambush.h +++ b/src/mame/includes/ambush.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ambush_state(machine)); } ambush_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index b749e54f160..733d97dff98 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, amspdwy_state(machine)); } amspdwy_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/angelkds.h b/src/mame/includes/angelkds.h index 95b214c3297..be84ce84ee0 100644 --- a/src/mame/includes/angelkds.h +++ b/src/mame/includes/angelkds.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, angelkds_state(machine)); } angelkds_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * paletteram; UINT8 * spriteram; diff --git a/src/mame/includes/appoooh.h b/src/mame/includes/appoooh.h index 6bfb3ac6317..853c9e9cbb8 100644 --- a/src/mame/includes/appoooh.h +++ b/src/mame/includes/appoooh.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, appoooh_state(machine)); } appoooh_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bg_videoram; UINT8 * bg_colorram; diff --git a/src/mame/includes/aquarium.h b/src/mame/includes/aquarium.h index 140e3678352..2b90c893891 100644 --- a/src/mame/includes/aquarium.h +++ b/src/mame/includes/aquarium.h @@ -7,7 +7,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, aquarium_state(machine)); } aquarium_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * scroll; UINT16 * txt_videoram; diff --git a/src/mame/includes/arabian.h b/src/mame/includes/arabian.h index 747d46c1d50..e2e20b62859 100644 --- a/src/mame/includes/arabian.h +++ b/src/mame/includes/arabian.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, arabian_state(machine)); } arabian_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * blitter; UINT8 * custom_cpu_ram; diff --git a/src/mame/includes/arkanoid.h b/src/mame/includes/arkanoid.h index b09710d3117..4a8f16035dd 100644 --- a/src/mame/includes/arkanoid.h +++ b/src/mame/includes/arkanoid.h @@ -16,7 +16,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, arkanoid_state(machine)); } arkanoid_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/armedf.h b/src/mame/includes/armedf.h index 472667883e6..3f1df6f25b0 100644 --- a/src/mame/includes/armedf.h +++ b/src/mame/includes/armedf.h @@ -8,7 +8,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, armedf_state(machine)); } armedf_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * text_videoram; UINT16 * bg_videoram; diff --git a/src/mame/includes/ashnojoe.h b/src/mame/includes/ashnojoe.h index 9b6e67d56a8..c11b3536c68 100644 --- a/src/mame/includes/ashnojoe.h +++ b/src/mame/includes/ashnojoe.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ashnojoe_state(machine)); } ashnojoe_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * tileram; UINT16 * tileram_1; diff --git a/src/mame/includes/asterix.h b/src/mame/includes/asterix.h index 969fb50da5d..5f5752cea20 100644 --- a/src/mame/includes/asterix.h +++ b/src/mame/includes/asterix.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, asterix_state(machine)); } asterix_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/astrof.h b/src/mame/includes/astrof.h index b634346e63a..a3751d84bed 100644 --- a/src/mame/includes/astrof.h +++ b/src/mame/includes/astrof.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, astrof_state(machine)); } astrof_state(running_machine &machine) { } - + /* video-related */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/includes/asuka.h b/src/mame/includes/asuka.h index f8364444fd8..ba00405c563 100644 --- a/src/mame/includes/asuka.h +++ b/src/mame/includes/asuka.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, asuka_state(machine)); } asuka_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * paletteram; // this currently uses generic palette handlers diff --git a/src/mame/includes/atarifb.h b/src/mame/includes/atarifb.h index 262afc391dd..d5c53988a9d 100644 --- a/src/mame/includes/atarifb.h +++ b/src/mame/includes/atarifb.h @@ -21,7 +21,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarifb_state(machine)); } atarifb_state(running_machine &machine) { } - + /* video-related */ UINT8 * alphap1_videoram; UINT8 * alphap2_videoram; diff --git a/src/mame/includes/atarig1.h b/src/mame/includes/atarig1.h index d455f5c66ef..e68b7293640 100644 --- a/src/mame/includes/atarig1.h +++ b/src/mame/includes/atarig1.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarig1_state(machine)); } atarig1_state(running_machine &machine) { } - + atarigen_state atarigen; UINT8 is_pitfight; diff --git a/src/mame/includes/atarig42.h b/src/mame/includes/atarig42.h index 9bea51d59f4..eb9a391cda0 100644 --- a/src/mame/includes/atarig42.h +++ b/src/mame/includes/atarig42.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarig42_state(machine)); } atarig42_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 playfield_base; UINT16 motion_object_base; diff --git a/src/mame/includes/atarigt.h b/src/mame/includes/atarigt.h index dcee276c1f2..cd12a5e24ee 100644 --- a/src/mame/includes/atarigt.h +++ b/src/mame/includes/atarigt.h @@ -17,7 +17,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarigt_state(machine)); } atarigt_state(running_machine &machine) { } - + atarigen_state atarigen; UINT8 is_primrage; UINT16 * colorram; diff --git a/src/mame/includes/atarigx2.h b/src/mame/includes/atarigx2.h index 0aabe978f4c..a66ccf3bb00 100644 --- a/src/mame/includes/atarigx2.h +++ b/src/mame/includes/atarigx2.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarigx2_state(machine)); } atarigx2_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 playfield_base; UINT16 motion_object_base; diff --git a/src/mame/includes/atarisy1.h b/src/mame/includes/atarisy1.h index e8707e463c6..3d855a44ef5 100644 --- a/src/mame/includes/atarisy1.h +++ b/src/mame/includes/atarisy1.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarisy1_state(machine)); } atarisy1_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 * bankselect; diff --git a/src/mame/includes/atarisy2.h b/src/mame/includes/atarisy2.h index 30d67bc3d52..fea29c7b07d 100644 --- a/src/mame/includes/atarisy2.h +++ b/src/mame/includes/atarisy2.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, atarisy2_state(machine)); } atarisy2_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 * slapstic_base; diff --git a/src/mame/includes/avalnche.h b/src/mame/includes/avalnche.h index 8dae1347ae0..0ecf4430d11 100644 --- a/src/mame/includes/avalnche.h +++ b/src/mame/includes/avalnche.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, avalnche_state(machine)); } avalnche_state(running_machine &machine) { } - + /* video-related */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/includes/badlands.h b/src/mame/includes/badlands.h index 384ad4a7b3f..118b2e1148b 100644 --- a/src/mame/includes/badlands.h +++ b/src/mame/includes/badlands.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, badlands_state(machine)); } badlands_state(running_machine &machine) { } - + atarigen_state atarigen; UINT8 pedal_value[2]; diff --git a/src/mame/includes/balsente.h b/src/mame/includes/balsente.h index 5242ef785c3..ed82b71f075 100644 --- a/src/mame/includes/balsente.h +++ b/src/mame/includes/balsente.h @@ -31,7 +31,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, balsente_state(machine)); } balsente_state(running_machine &machine) { } - + /* global data */ UINT8 shooter; UINT8 shooter_x; diff --git a/src/mame/includes/bankp.h b/src/mame/includes/bankp.h index 4cdac62624c..2b594773a4a 100644 --- a/src/mame/includes/bankp.h +++ b/src/mame/includes/bankp.h @@ -15,7 +15,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bankp_state(machine)); } bankp_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/batman.h b/src/mame/includes/batman.h index bff6a6bc55d..f8911124aa1 100644 --- a/src/mame/includes/batman.h +++ b/src/mame/includes/batman.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, batman_state(machine)); } batman_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 latch_data; diff --git a/src/mame/includes/battlane.h b/src/mame/includes/battlane.h index 110793dba20..e15f125a2df 100644 --- a/src/mame/includes/battlane.h +++ b/src/mame/includes/battlane.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlane_state(machine)); } battlane_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * tileram; UINT8 * spriteram; diff --git a/src/mame/includes/battlex.h b/src/mame/includes/battlex.h index 94a0d7192ea..0b33c0f03df 100644 --- a/src/mame/includes/battlex.h +++ b/src/mame/includes/battlex.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlex_state(machine)); } battlex_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/battlnts.h b/src/mame/includes/battlnts.h index e2456b60b64..6f943084787 100644 --- a/src/mame/includes/battlnts.h +++ b/src/mame/includes/battlnts.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, battlnts_state(machine)); } battlnts_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 * paletteram; // this currently uses generic palette handling diff --git a/src/mame/includes/beathead.h b/src/mame/includes/beathead.h index 3a899f3337a..2e94935006c 100644 --- a/src/mame/includes/beathead.h +++ b/src/mame/includes/beathead.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, beathead_state(machine)); } beathead_state(running_machine &machine) { } - + atarigen_state atarigen; UINT32 * vram_bulk_latch; diff --git a/src/mame/includes/bigevglf.h b/src/mame/includes/bigevglf.h index af9197c3073..82b131a543b 100644 --- a/src/mame/includes/bigevglf.h +++ b/src/mame/includes/bigevglf.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigevglf_state(machine)); } bigevglf_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * paletteram; UINT8 * spriteram1; diff --git a/src/mame/includes/bigstrkb.h b/src/mame/includes/bigstrkb.h index 8a2c86854c6..f37d8e60089 100644 --- a/src/mame/includes/bigstrkb.h +++ b/src/mame/includes/bigstrkb.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bigstrkb_state(machine)); } bigstrkb_state(running_machine &machine) { } - + tilemap_t *tilemap; tilemap_t *tilemap2; tilemap_t *tilemap3; diff --git a/src/mame/includes/bionicc.h b/src/mame/includes/bionicc.h index 7a0bf66588d..244ce185d52 100644 --- a/src/mame/includes/bionicc.h +++ b/src/mame/includes/bionicc.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bionicc_state(machine)); } bionicc_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bgvideoram; UINT16 * fgvideoram; diff --git a/src/mame/includes/bishi.h b/src/mame/includes/bishi.h index 978b0fe5a33..711dc3270ad 100644 --- a/src/mame/includes/bishi.h +++ b/src/mame/includes/bishi.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bishi_state(machine)); } bishi_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/bladestl.h b/src/mame/includes/bladestl.h index 95ef43dac66..16ab06256a9 100644 --- a/src/mame/includes/bladestl.h +++ b/src/mame/includes/bladestl.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bladestl_state(machine)); } bladestl_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * paletteram; diff --git a/src/mame/includes/blktiger.h b/src/mame/includes/blktiger.h index d22c6bc1031..72b40b01f3b 100644 --- a/src/mame/includes/blktiger.h +++ b/src/mame/includes/blktiger.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blktiger_state(machine)); } blktiger_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * txvideoram; // UINT8 * spriteram; // currently this uses generic buffer_spriteram_w diff --git a/src/mame/includes/blmbycar.h b/src/mame/includes/blmbycar.h index 7f2a49232f5..10e9f9faa6d 100644 --- a/src/mame/includes/blmbycar.h +++ b/src/mame/includes/blmbycar.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blmbycar_state(machine)); } blmbycar_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * vram_0; UINT16 * scroll_0; diff --git a/src/mame/includes/blockade.h b/src/mame/includes/blockade.h index f7ed5a63093..c7faf95a4e8 100644 --- a/src/mame/includes/blockade.h +++ b/src/mame/includes/blockade.h @@ -7,7 +7,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockade_state(machine)); } blockade_state(running_machine &machine) { } - + UINT8 * videoram; /* video-related */ diff --git a/src/mame/includes/blockhl.h b/src/mame/includes/blockhl.h index 05dab594bc5..e4ca63a728a 100644 --- a/src/mame/includes/blockhl.h +++ b/src/mame/includes/blockhl.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockhl_state(machine)); } blockhl_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/blockout.h b/src/mame/includes/blockout.h index bf5a0827afe..b1efe5fe4f7 100644 --- a/src/mame/includes/blockout.h +++ b/src/mame/includes/blockout.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blockout_state(machine)); } blockout_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * frontvideoram; diff --git a/src/mame/includes/blstroid.h b/src/mame/includes/blstroid.h index 271b8736f56..71793617d1f 100644 --- a/src/mame/includes/blstroid.h +++ b/src/mame/includes/blstroid.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blstroid_state(machine)); } blstroid_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 * priorityram; diff --git a/src/mame/includes/blueprnt.h b/src/mame/includes/blueprnt.h index dbf7dd52c97..6decedd0729 100644 --- a/src/mame/includes/blueprnt.h +++ b/src/mame/includes/blueprnt.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, blueprnt_state(machine)); } blueprnt_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/bogeyman.h b/src/mame/includes/bogeyman.h index afd8e012c25..e58fe6d9820 100644 --- a/src/mame/includes/bogeyman.h +++ b/src/mame/includes/bogeyman.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bogeyman_state(machine)); } bogeyman_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/includes/bombjack.h b/src/mame/includes/bombjack.h index 0c161271cec..6f42f8f7ef5 100644 --- a/src/mame/includes/bombjack.h +++ b/src/mame/includes/bombjack.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bombjack_state(machine)); } bombjack_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/bottom9.h b/src/mame/includes/bottom9.h index 101abd67e3b..804bc1a72d9 100644 --- a/src/mame/includes/bottom9.h +++ b/src/mame/includes/bottom9.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bottom9_state(machine)); } bottom9_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/brkthru.h b/src/mame/includes/brkthru.h index 524071f79e8..74bcca56d64 100644 --- a/src/mame/includes/brkthru.h +++ b/src/mame/includes/brkthru.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, brkthru_state(machine)); } brkthru_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/bsktball.h b/src/mame/includes/bsktball.h index ecf58ff47de..a8b8aa19fa3 100644 --- a/src/mame/includes/bsktball.h +++ b/src/mame/includes/bsktball.h @@ -19,7 +19,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bsktball_state(machine)); } bsktball_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * motion; diff --git a/src/mame/includes/btime.h b/src/mame/includes/btime.h index a709c9de617..dacfffd1a14 100644 --- a/src/mame/includes/btime.h +++ b/src/mame/includes/btime.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, btime_state(machine)); } btime_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/bublbobl.h b/src/mame/includes/bublbobl.h index dc557179c37..b327d969d27 100644 --- a/src/mame/includes/bublbobl.h +++ b/src/mame/includes/bublbobl.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bublbobl_state(machine)); } bublbobl_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * mcu_sharedram; UINT8 * videoram; diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index 90cc503cc13..f52d51082b8 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -9,7 +9,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, buggychl_state(machine)); } buggychl_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; // buggychl, 40love, msisaac UINT8 * videoram2; // msisaac diff --git a/src/mame/includes/bwing.h b/src/mame/includes/bwing.h index 4aee7e182b2..5d17dcb0018 100644 --- a/src/mame/includes/bwing.h +++ b/src/mame/includes/bwing.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, bwing_state(machine)); } bwing_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/cabal.h b/src/mame/includes/cabal.h index b75b659d909..09c4f42af34 100644 --- a/src/mame/includes/cabal.h +++ b/src/mame/includes/cabal.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cabal_state(machine)); } cabal_state(running_machine &machine) { } - + UINT16 *spriteram; UINT16 *colorram; UINT16 *videoram; diff --git a/src/mame/includes/canyon.h b/src/mame/includes/canyon.h index 822ab816031..2d7a411d367 100644 --- a/src/mame/includes/canyon.h +++ b/src/mame/includes/canyon.h @@ -23,7 +23,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, canyon_state(machine)); } canyon_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/capbowl.h b/src/mame/includes/capbowl.h index 93504f9d3d0..7d525de804b 100644 --- a/src/mame/includes/capbowl.h +++ b/src/mame/includes/capbowl.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, capbowl_state(machine)); } capbowl_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * rowaddress; // UINT8 * nvram; // currently this uses generic_nvram diff --git a/src/mame/includes/carjmbre.h b/src/mame/includes/carjmbre.h index f12ab08441f..fef16ad7ba0 100644 --- a/src/mame/includes/carjmbre.h +++ b/src/mame/includes/carjmbre.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, carjmbre_state(machine)); } carjmbre_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/cave.h b/src/mame/includes/cave.h index e68d98de657..52b2eb57f85 100644 --- a/src/mame/includes/cave.h +++ b/src/mame/includes/cave.h @@ -27,7 +27,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cave_state(machine)); } cave_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoregs; UINT16 * vram_0; diff --git a/src/mame/includes/cbasebal.h b/src/mame/includes/cbasebal.h index b9bd912eee6..a22268f5188 100644 --- a/src/mame/includes/cbasebal.h +++ b/src/mame/includes/cbasebal.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cbasebal_state(machine)); } cbasebal_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * spriteram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/ccastles.h b/src/mame/includes/ccastles.h index 8b353550d3e..bd0d80cf48a 100644 --- a/src/mame/includes/ccastles.h +++ b/src/mame/includes/ccastles.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ccastles_state(machine)); } ccastles_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/chaknpop.h b/src/mame/includes/chaknpop.h index 0800e0d310f..58b2bc0aecb 100644 --- a/src/mame/includes/chaknpop.h +++ b/src/mame/includes/chaknpop.h @@ -9,7 +9,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chaknpop_state(machine)); } chaknpop_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * mcu_ram; UINT8 * tx_ram; diff --git a/src/mame/includes/champbas.h b/src/mame/includes/champbas.h index 803c3bf402c..c84e3e6fcbe 100644 --- a/src/mame/includes/champbas.h +++ b/src/mame/includes/champbas.h @@ -14,7 +14,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, champbas_state(machine)); } champbas_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bg_videoram; UINT8 * spriteram; diff --git a/src/mame/includes/changela.h b/src/mame/includes/changela.h index abbf9f9e228..4cffa36993b 100644 --- a/src/mame/includes/changela.h +++ b/src/mame/includes/changela.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, changela_state(machine)); } changela_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/cheekyms.h b/src/mame/includes/cheekyms.h index 89904d93e89..5d5a4f071c4 100644 --- a/src/mame/includes/cheekyms.h +++ b/src/mame/includes/cheekyms.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cheekyms_state(machine)); } cheekyms_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/chqflag.h b/src/mame/includes/chqflag.h index 2ca387beca7..6b2e2e517ac 100644 --- a/src/mame/includes/chqflag.h +++ b/src/mame/includes/chqflag.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, chqflag_state(machine)); } chqflag_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/circus.h b/src/mame/includes/circus.h index e11394df88f..a82603987a4 100644 --- a/src/mame/includes/circus.h +++ b/src/mame/includes/circus.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, circus_state(machine)); } circus_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/circusc.h b/src/mame/includes/circusc.h index 02d875e1a8b..831575bb42b 100644 --- a/src/mame/includes/circusc.h +++ b/src/mame/includes/circusc.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, circusc_state(machine)); } circusc_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/citycon.h b/src/mame/includes/citycon.h index e2c464a1fa6..64176bbab98 100644 --- a/src/mame/includes/citycon.h +++ b/src/mame/includes/citycon.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, citycon_state(machine)); } citycon_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * linecolor; diff --git a/src/mame/includes/cloud9.h b/src/mame/includes/cloud9.h index 022939f99f7..9d446c594b8 100644 --- a/src/mame/includes/cloud9.h +++ b/src/mame/includes/cloud9.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cloud9_state(machine)); } cloud9_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h index 84bdcaedf1b..ba4bef113b5 100644 --- a/src/mame/includes/combatsc.h +++ b/src/mame/includes/combatsc.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, combatsc_state(machine)); } combatsc_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * scrollram; diff --git a/src/mame/includes/commando.h b/src/mame/includes/commando.h index 655c684868e..3145dc6a7fd 100644 --- a/src/mame/includes/commando.h +++ b/src/mame/includes/commando.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, commando_state(machine)); } commando_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/compgolf.h b/src/mame/includes/compgolf.h index 9ce00b94c37..3a879ea5569 100644 --- a/src/mame/includes/compgolf.h +++ b/src/mame/includes/compgolf.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, compgolf_state(machine)); } compgolf_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * bg_ram; diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h index 2be546613bc..6641cc459ce 100644 --- a/src/mame/includes/contra.h +++ b/src/mame/includes/contra.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, contra_state(machine)); } contra_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * spriteram; UINT8 * spriteram_2; diff --git a/src/mame/includes/cop01.h b/src/mame/includes/cop01.h index 50d4b03f0b7..6665f62c8ca 100644 --- a/src/mame/includes/cop01.h +++ b/src/mame/includes/cop01.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cop01_state(machine)); } cop01_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgvideoram; UINT8 * fgvideoram; diff --git a/src/mame/includes/copsnrob.h b/src/mame/includes/copsnrob.h index d826702bb77..a0fbf185208 100644 --- a/src/mame/includes/copsnrob.h +++ b/src/mame/includes/copsnrob.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, copsnrob_state(machine)); } copsnrob_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * trucky; diff --git a/src/mame/includes/cosmic.h b/src/mame/includes/cosmic.h index 9c44086eb2e..cbf8a690160 100644 --- a/src/mame/includes/cosmic.h +++ b/src/mame/includes/cosmic.h @@ -14,7 +14,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cosmic_state(machine)); } cosmic_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/cps1.h b/src/mame/includes/cps1.h index 4a0d25fa9f9..96e7bcbda21 100644 --- a/src/mame/includes/cps1.h +++ b/src/mame/includes/cps1.h @@ -63,7 +63,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cps_state(machine)); } cps_state(running_machine &machine) { } - + /* memory pointers */ // cps1 UINT16 * gfxram; diff --git a/src/mame/includes/crgolf.h b/src/mame/includes/crgolf.h index a8e6fc22394..ebdfceaa2a1 100644 --- a/src/mame/includes/crgolf.h +++ b/src/mame/includes/crgolf.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crgolf_state(machine)); } crgolf_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram_a; UINT8 * videoram_b; diff --git a/src/mame/includes/crimfght.h b/src/mame/includes/crimfght.h index 333a12e2213..a8fffa9a97a 100644 --- a/src/mame/includes/crimfght.h +++ b/src/mame/includes/crimfght.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crimfght_state(machine)); } crimfght_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/crospang.h b/src/mame/includes/crospang.h index 5ce2d62fc65..0f3947569b1 100644 --- a/src/mame/includes/crospang.h +++ b/src/mame/includes/crospang.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crospang_state(machine)); } crospang_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg_videoram; UINT16 * fg_videoram; diff --git a/src/mame/includes/crshrace.h b/src/mame/includes/crshrace.h index 0fa6eed6668..365f7eb1333 100644 --- a/src/mame/includes/crshrace.h +++ b/src/mame/includes/crshrace.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, crshrace_state(machine)); } crshrace_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram1; UINT16 * videoram2; diff --git a/src/mame/includes/cvs.h b/src/mame/includes/cvs.h index 2c5757194d2..3ab5ca0527c 100644 --- a/src/mame/includes/cvs.h +++ b/src/mame/includes/cvs.h @@ -22,7 +22,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cvs_state(machine)); } cvs_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * video_ram; UINT8 * bullet_ram; diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index cc218074f47..199ec697102 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, cyberbal_state(machine)); } cyberbal_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 * paletteram_0; diff --git a/src/mame/includes/darius.h b/src/mame/includes/darius.h index 7f25da27c33..92e43690671 100644 --- a/src/mame/includes/darius.h +++ b/src/mame/includes/darius.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, darius_state(machine)); } darius_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; UINT16 * fg_ram; diff --git a/src/mame/includes/dbz.h b/src/mame/includes/dbz.h index 808d5f0b5ae..deccc424bd1 100644 --- a/src/mame/includes/dbz.h +++ b/src/mame/includes/dbz.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dbz_state(machine)); } dbz_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg1_videoram; UINT16 * bg2_videoram; diff --git a/src/mame/includes/dcheese.h b/src/mame/includes/dcheese.h index d773b1bb18d..dea6d7c1669 100644 --- a/src/mame/includes/dcheese.h +++ b/src/mame/includes/dcheese.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dcheese_state(machine)); } dcheese_state(running_machine &machine) { } - + /* video-related */ UINT16 blitter_color[2]; UINT16 blitter_xparam[16]; diff --git a/src/mame/includes/dday.h b/src/mame/includes/dday.h index 3b6ca8ef9a5..9f515e18911 100644 --- a/src/mame/includes/dday.h +++ b/src/mame/includes/dday.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dday_state(machine)); } dday_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgvideoram; UINT8 * fgvideoram; diff --git a/src/mame/includes/ddragon.h b/src/mame/includes/ddragon.h index 1fcfd3c8d0f..03fcb99b4fe 100644 --- a/src/mame/includes/ddragon.h +++ b/src/mame/includes/ddragon.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddragon_state(machine)); } ddragon_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * rambase; UINT8 * bgvideoram; diff --git a/src/mame/includes/ddragon3.h b/src/mame/includes/ddragon3.h index 78cc582fa95..333c68d5559 100644 --- a/src/mame/includes/ddragon3.h +++ b/src/mame/includes/ddragon3.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddragon3_state(machine)); } ddragon3_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg_videoram; UINT16 * fg_videoram; diff --git a/src/mame/includes/ddribble.h b/src/mame/includes/ddribble.h index d0530b1760a..189a12dc1b7 100644 --- a/src/mame/includes/ddribble.h +++ b/src/mame/includes/ddribble.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ddribble_state(machine)); } ddribble_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * sharedram; UINT8 * snd_sharedram; diff --git a/src/mame/includes/dec8.h b/src/mame/includes/dec8.h index a7251bfadac..dd53945f4cc 100644 --- a/src/mame/includes/dec8.h +++ b/src/mame/includes/dec8.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dec8_state(machine)); } dec8_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * pf0_data; diff --git a/src/mame/includes/deniam.h b/src/mame/includes/deniam.h index a3806e61d15..5ddf4f5fd34 100644 --- a/src/mame/includes/deniam.h +++ b/src/mame/includes/deniam.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, deniam_state(machine)); } deniam_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * textram; diff --git a/src/mame/includes/djboy.h b/src/mame/includes/djboy.h index 87adb8d2e92..739400933ed 100644 --- a/src/mame/includes/djboy.h +++ b/src/mame/includes/djboy.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, djboy_state(machine)); } djboy_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * paletteram; diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index a1f8fa91a5d..5766b9deb1e 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -75,7 +75,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dkong_state(machine)); } dkong_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * video_ram; UINT8 * sprite_ram; diff --git a/src/mame/includes/docastle.h b/src/mame/includes/docastle.h index 3da54d9b84b..e9237a65c13 100644 --- a/src/mame/includes/docastle.h +++ b/src/mame/includes/docastle.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, docastle_state(machine)); } docastle_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/dogfgt.h b/src/mame/includes/dogfgt.h index be175ccd933..c9204217aa7 100644 --- a/src/mame/includes/dogfgt.h +++ b/src/mame/includes/dogfgt.h @@ -9,7 +9,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dogfgt_state(machine)); } dogfgt_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgvideoram; UINT8 * spriteram; diff --git a/src/mame/includes/dragrace.h b/src/mame/includes/dragrace.h index bd3c73464ad..84e1301b961 100644 --- a/src/mame/includes/dragrace.h +++ b/src/mame/includes/dragrace.h @@ -28,7 +28,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dragrace_state(machine)); } dragrace_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * playfield_ram; UINT8 * position_ram; diff --git a/src/mame/includes/drgnmst.h b/src/mame/includes/drgnmst.h index 540d00d9119..085e2941bf9 100644 --- a/src/mame/includes/drgnmst.h +++ b/src/mame/includes/drgnmst.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drgnmst_state(machine)); } drgnmst_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * vidregs; UINT16 * fg_videoram; diff --git a/src/mame/includes/dribling.h b/src/mame/includes/dribling.h index ff8db22fc12..adb83a867e7 100644 --- a/src/mame/includes/dribling.h +++ b/src/mame/includes/dribling.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, dribling_state(machine)); } dribling_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/drmicro.h b/src/mame/includes/drmicro.h index 12b6bac06fe..5cf19a54706 100644 --- a/src/mame/includes/drmicro.h +++ b/src/mame/includes/drmicro.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, drmicro_state(machine)); } drmicro_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/epos.h b/src/mame/includes/epos.h index 0d198a5529c..cbbb39d225f 100644 --- a/src/mame/includes/epos.h +++ b/src/mame/includes/epos.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, epos_state(machine)); } epos_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/includes/eprom.h b/src/mame/includes/eprom.h index 468bc4fb57a..ab6d7d4239a 100644 --- a/src/mame/includes/eprom.h +++ b/src/mame/includes/eprom.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, eprom_state(machine)); } eprom_state(running_machine &machine) { } - + atarigen_state atarigen; int screen_intensity; int video_disable; diff --git a/src/mame/includes/equites.h b/src/mame/includes/equites.h index 346242af232..2558028c939 100644 --- a/src/mame/includes/equites.h +++ b/src/mame/includes/equites.h @@ -8,7 +8,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, equites_state(machine)); } equites_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg_videoram; UINT8 * fg_videoram; // 8bits diff --git a/src/mame/includes/esd16.h b/src/mame/includes/esd16.h index 2dcd3673719..e85541764d3 100644 --- a/src/mame/includes/esd16.h +++ b/src/mame/includes/esd16.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, esd16_state(machine)); } esd16_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * vram_0; UINT16 * vram_1; diff --git a/src/mame/includes/espial.h b/src/mame/includes/espial.h index 2c943d7f99b..1adc5dcd217 100644 --- a/src/mame/includes/espial.h +++ b/src/mame/includes/espial.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, espial_state(machine)); } espial_state(running_machine &machine) { } - + UINT8 * videoram; // espial, zodiack, marineb UINT8 * colorram; // espial, marineb UINT8 * attributeram; // espial, zodiack diff --git a/src/mame/includes/exedexes.h b/src/mame/includes/exedexes.h index 7a5df73deb8..c665dc7e59a 100644 --- a/src/mame/includes/exedexes.h +++ b/src/mame/includes/exedexes.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exedexes_state(machine)); } exedexes_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index e0769d39a82..840fd999371 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -24,7 +24,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exerion_state(machine)); } exerion_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * main_ram; UINT8 * videoram; diff --git a/src/mame/includes/exprraid.h b/src/mame/includes/exprraid.h index f27dde07120..1f579914745 100644 --- a/src/mame/includes/exprraid.h +++ b/src/mame/includes/exprraid.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, exprraid_state(machine)); } exprraid_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * main_ram; UINT8 * videoram; diff --git a/src/mame/includes/f1gp.h b/src/mame/includes/f1gp.h index 8d8b6c5d1a9..547a2e72bd3 100644 --- a/src/mame/includes/f1gp.h +++ b/src/mame/includes/f1gp.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, f1gp_state(machine)); } f1gp_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * sharedram; UINT16 * spr1vram; diff --git a/src/mame/includes/fantland.h b/src/mame/includes/fantland.h index 9eb581b6e7d..8b6c4145f3c 100644 --- a/src/mame/includes/fantland.h +++ b/src/mame/includes/fantland.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fantland_state(machine)); } fantland_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 * spriteram; // currently directly used in a 16bit map... // UINT8 * spriteram_2; // currently directly used in a 16bit map... diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h index 74dbb5ea0f0..bf123a97cb7 100644 --- a/src/mame/includes/fastlane.h +++ b/src/mame/includes/fastlane.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fastlane_state(machine)); } fastlane_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram1; UINT8 * videoram2; diff --git a/src/mame/includes/fcombat.h b/src/mame/includes/fcombat.h index 6efbdf9ea1b..c8b23becd25 100644 --- a/src/mame/includes/fcombat.h +++ b/src/mame/includes/fcombat.h @@ -28,7 +28,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fcombat_state(machine)); } fcombat_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/fgoal.h b/src/mame/includes/fgoal.h index 6146a3cf9d9..93aa738487d 100644 --- a/src/mame/includes/fgoal.h +++ b/src/mame/includes/fgoal.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fgoal_state(machine)); } fgoal_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * video_ram; diff --git a/src/mame/includes/finalizr.h b/src/mame/includes/finalizr.h index 77cb62e0968..2d2856f07c9 100644 --- a/src/mame/includes/finalizr.h +++ b/src/mame/includes/finalizr.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, finalizr_state(machine)); } finalizr_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/firetrap.h b/src/mame/includes/firetrap.h index 5295a21e3d4..1cb4386948e 100644 --- a/src/mame/includes/firetrap.h +++ b/src/mame/includes/firetrap.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, firetrap_state(machine)); } firetrap_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bg1videoram; UINT8 * bg2videoram; diff --git a/src/mame/includes/fitfight.h b/src/mame/includes/fitfight.h index 27eb0f25c56..2fd7f26c397 100644 --- a/src/mame/includes/fitfight.h +++ b/src/mame/includes/fitfight.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fitfight_state(machine)); } fitfight_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * fof_100000; UINT16 * fof_600000; diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h index 616593324be..78f53e780d7 100644 --- a/src/mame/includes/flkatck.h +++ b/src/mame/includes/flkatck.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flkatck_state(machine)); } flkatck_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * k007121_ram; // UINT8 * paletteram; // this currently uses generic palette handling diff --git a/src/mame/includes/flstory.h b/src/mame/includes/flstory.h index 4e4aac71340..3cebc2f7f1d 100644 --- a/src/mame/includes/flstory.h +++ b/src/mame/includes/flstory.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, flstory_state(machine)); } flstory_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * workram; diff --git a/src/mame/includes/foodf.h b/src/mame/includes/foodf.h index e2644b4a149..19f11a8c7e2 100644 --- a/src/mame/includes/foodf.h +++ b/src/mame/includes/foodf.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, foodf_state(machine)); } foodf_state(running_machine &machine) { } - + atarigen_state atarigen; double rweights[3]; diff --git a/src/mame/includes/freekick.h b/src/mame/includes/freekick.h index e6b78e15b00..5f1ef06fbc4 100644 --- a/src/mame/includes/freekick.h +++ b/src/mame/includes/freekick.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, freekick_state(machine)); } freekick_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/fromanc2.h b/src/mame/includes/fromanc2.h index 621736557a5..ff0487ca927 100644 --- a/src/mame/includes/fromanc2.h +++ b/src/mame/includes/fromanc2.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fromanc2_state(machine)); } fromanc2_state(running_machine &machine) { } - + /* memory pointers */ UINT16 *paletteram[2]; UINT16 *videoram[2][4]; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index f070a386b5d..856ce5cef32 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fromance_state(machine)); } fromance_state(running_machine &machine) { } - + /* memory pointers (used by pipedrm) */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/funkybee.h b/src/mame/includes/funkybee.h index fd7968bf262..71a3b01b180 100644 --- a/src/mame/includes/funkybee.h +++ b/src/mame/includes/funkybee.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, funkybee_state(machine)); } funkybee_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/funybubl.h b/src/mame/includes/funybubl.h index 921665d7f5a..ba91c3b621f 100644 --- a/src/mame/includes/funybubl.h +++ b/src/mame/includes/funybubl.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, funybubl_state(machine)); } funybubl_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * banked_vram; UINT8 * paletteram; diff --git a/src/mame/includes/fuukifg2.h b/src/mame/includes/fuukifg2.h index ec6abb3895e..0955833603a 100644 --- a/src/mame/includes/fuukifg2.h +++ b/src/mame/includes/fuukifg2.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fuuki16_state(machine)); } fuuki16_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * vram_0; UINT16 * vram_1; diff --git a/src/mame/includes/fuukifg3.h b/src/mame/includes/fuukifg3.h index fa89914543b..ae493fe064b 100644 --- a/src/mame/includes/fuukifg3.h +++ b/src/mame/includes/fuukifg3.h @@ -15,7 +15,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, fuuki32_state(machine)); } fuuki32_state(running_machine &machine) { } - + /* memory pointers */ UINT32 * vram_0; UINT32 * vram_1; diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index c2517f7c154..8a7fd78a1c6 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gaelco_state(machine)); } gaelco_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * spriteram; diff --git a/src/mame/includes/gaiden.h b/src/mame/includes/gaiden.h index ec5071e45c9..83db5fcc5fa 100644 --- a/src/mame/includes/gaiden.h +++ b/src/mame/includes/gaiden.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gaiden_state(machine)); } gaiden_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * videoram2; diff --git a/src/mame/includes/galivan.h b/src/mame/includes/galivan.h index 66525b1329a..1e4bb26c47c 100644 --- a/src/mame/includes/galivan.h +++ b/src/mame/includes/galivan.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galivan_state(machine)); } galivan_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 950ab7825f3..67f376a60d0 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, galspnbl_state(machine)); } galspnbl_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * bgvideoram; diff --git a/src/mame/includes/gameplan.h b/src/mame/includes/gameplan.h index 1e20cfde6d3..5de5f48c814 100644 --- a/src/mame/includes/gameplan.h +++ b/src/mame/includes/gameplan.h @@ -27,7 +27,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gameplan_state(machine)); } gameplan_state(running_machine &machine) { } - + /* machine state */ UINT8 current_port; UINT8 *trvquest_question; diff --git a/src/mame/includes/gauntlet.h b/src/mame/includes/gauntlet.h index 1e9ce1b3929..2e2b5052107 100644 --- a/src/mame/includes/gauntlet.h +++ b/src/mame/includes/gauntlet.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gauntlet_state(machine)); } gauntlet_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 sound_reset_val; UINT8 vindctr2_screen_refresh; diff --git a/src/mame/includes/gberet.h b/src/mame/includes/gberet.h index b4eca2878fd..f9023704abf 100644 --- a/src/mame/includes/gberet.h +++ b/src/mame/includes/gberet.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gberet_state(machine)); } gberet_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/gbusters.h b/src/mame/includes/gbusters.h index 9167c2777e1..7b213fa6050 100644 --- a/src/mame/includes/gbusters.h +++ b/src/mame/includes/gbusters.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gbusters_state(machine)); } gbusters_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index da6b62747fd..b6e18a113ce 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gcpinbal_state(machine)); } gcpinbal_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * tilemapram; UINT16 * ioc_ram; diff --git a/src/mame/includes/gijoe.h b/src/mame/includes/gijoe.h index 81256034339..7011134a1d0 100644 --- a/src/mame/includes/gijoe.h +++ b/src/mame/includes/gijoe.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gijoe_state(machine)); } gijoe_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * workram; UINT16 * spriteram; diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index 2c89ec98307..bd1d02761bb 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ginganin_state(machine)); } ginganin_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * fgram; UINT16 * txtram; diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index e19648b4d80..8af8b235fb4 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, glass_state(machine)); } glass_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * vregs; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index 6a52539da9d..58cff5c3b17 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gng_state(machine)); } gng_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgvideoram; UINT8 * fgvideoram; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 4ff35fef2bc..88af796d906 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goal92_state(machine)); } goal92_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg_data; UINT16 * fg_data; diff --git a/src/mame/includes/goindol.h b/src/mame/includes/goindol.h index afef94a7f99..f03c4d69975 100644 --- a/src/mame/includes/goindol.h +++ b/src/mame/includes/goindol.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goindol_state(machine)); } goindol_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bg_videoram; UINT8 * fg_videoram; diff --git a/src/mame/includes/goldstar.h b/src/mame/includes/goldstar.h index 31dcaf67ede..4719db5248c 100644 --- a/src/mame/includes/goldstar.h +++ b/src/mame/includes/goldstar.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, goldstar_state(machine)); } goldstar_state(running_machine &machine) { } - + int dataoffset; UINT8 *nvram; diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index bfcc3884583..e89880be58e 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gotcha_state(machine)); } gotcha_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * fgvideoram; UINT16 * bgvideoram; diff --git a/src/mame/includes/gotya.h b/src/mame/includes/gotya.h index fbf84e469f5..8d1c4e37b5d 100644 --- a/src/mame/includes/gotya.h +++ b/src/mame/includes/gotya.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gotya_state(machine)); } gotya_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/includes/gradius3.h b/src/mame/includes/gradius3.h index af877700a63..25b71be277c 100644 --- a/src/mame/includes/gradius3.h +++ b/src/mame/includes/gradius3.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gradius3_state(machine)); } gradius3_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * gfxram; // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/grchamp.h b/src/mame/includes/grchamp.h index d8fb70ea987..9a8b91bb78d 100644 --- a/src/mame/includes/grchamp.h +++ b/src/mame/includes/grchamp.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, grchamp_state(machine)); } grchamp_state(running_machine &machine) { } - + UINT8 cpu0_out[16]; UINT8 cpu1_out[16]; diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index b76e6bcc9d7..4b664f539a1 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gumbo_state(machine)); } gumbo_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg_videoram; UINT16 * fg_videoram; diff --git a/src/mame/includes/gundealr.h b/src/mame/includes/gundealr.h index 6766dd8b50d..2c277b40105 100644 --- a/src/mame/includes/gundealr.h +++ b/src/mame/includes/gundealr.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gundealr_state(machine)); } gundealr_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bg_videoram; UINT8 * fg_videoram; diff --git a/src/mame/includes/gunsmoke.h b/src/mame/includes/gunsmoke.h index 1d6ae4b1afe..1de4da9474e 100644 --- a/src/mame/includes/gunsmoke.h +++ b/src/mame/includes/gunsmoke.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gunsmoke_state(machine)); } gunsmoke_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/gyruss.h b/src/mame/includes/gyruss.h index f95a72457cb..4f63a71e9c6 100644 --- a/src/mame/includes/gyruss.h +++ b/src/mame/includes/gyruss.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, gyruss_state(machine)); } gyruss_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/hanaawas.h b/src/mame/includes/hanaawas.h index 151b0a1e73c..ef7848404f6 100644 --- a/src/mame/includes/hanaawas.h +++ b/src/mame/includes/hanaawas.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hanaawas_state(machine)); } hanaawas_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/harddriv.h b/src/mame/includes/harddriv.h index d1d33a4ec5b..6830b2c9f95 100644 --- a/src/mame/includes/harddriv.h +++ b/src/mame/includes/harddriv.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, harddriv_state(machine)); } harddriv_state(running_machine &machine) { } - + atarigen_state atarigen; running_device * maincpu; diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h index 6ed366bfc87..326232bdeac 100644 --- a/src/mame/includes/hcastle.h +++ b/src/mame/includes/hcastle.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hcastle_state(machine)); } hcastle_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * pf1_videoram; UINT8 * pf2_videoram; diff --git a/src/mame/includes/higemaru.h b/src/mame/includes/higemaru.h index 8c5e4561007..b83b75ba1d9 100644 --- a/src/mame/includes/higemaru.h +++ b/src/mame/includes/higemaru.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, higemaru_state(machine)); } higemaru_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 568a3aaf5bb..2178a7b5822 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, himesiki_state(machine)); } himesiki_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bg_ram; UINT8 * spriteram; diff --git a/src/mame/includes/hitme.h b/src/mame/includes/hitme.h index a9e1e59aea3..47566a50340 100644 --- a/src/mame/includes/hitme.h +++ b/src/mame/includes/hitme.h @@ -18,7 +18,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hitme_state(machine)); } hitme_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/hnayayoi.h b/src/mame/includes/hnayayoi.h index e6d1ab18ff2..c1320b71edf 100644 --- a/src/mame/includes/hnayayoi.h +++ b/src/mame/includes/hnayayoi.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hnayayoi_state(machine)); } hnayayoi_state(running_machine &machine) { } - + /* video-related */ UINT8 *pixmap[8]; int palbank; diff --git a/src/mame/includes/holeland.h b/src/mame/includes/holeland.h index 9a628b549a4..86228f2d166 100644 --- a/src/mame/includes/holeland.h +++ b/src/mame/includes/holeland.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, holeland_state(machine)); } holeland_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/homedata.h b/src/mame/includes/homedata.h index e708a30fc55..f3bb7aa50bb 100644 --- a/src/mame/includes/homedata.h +++ b/src/mame/includes/homedata.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, homedata_state(machine)); } homedata_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * vreg; UINT8 * videoram; diff --git a/src/mame/includes/homerun.h b/src/mame/includes/homerun.h index ef64aa2a219..bfbe5ce766c 100644 --- a/src/mame/includes/homerun.h +++ b/src/mame/includes/homerun.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, homerun_state(machine)); } homerun_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/hyprduel.h b/src/mame/includes/hyprduel.h index 53ec7c28496..5d08e588027 100644 --- a/src/mame/includes/hyprduel.h +++ b/src/mame/includes/hyprduel.h @@ -8,7 +8,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, hyprduel_state(machine)); } hyprduel_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoregs; UINT16 * screenctrl; diff --git a/src/mame/includes/ikki.h b/src/mame/includes/ikki.h index fdd5c5fab76..e08dae83859 100644 --- a/src/mame/includes/ikki.h +++ b/src/mame/includes/ikki.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ikki_state(machine)); } ikki_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index d7f213c7e8d..4981df2e61c 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, inufuku_state(machine)); } inufuku_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bg_videoram; UINT16 * bg_rasterram; diff --git a/src/mame/includes/ironhors.h b/src/mame/includes/ironhors.h index d94c23329f7..ecd84a09d9e 100644 --- a/src/mame/includes/ironhors.h +++ b/src/mame/includes/ironhors.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ironhors_state(machine)); } ironhors_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index 4224b4a0087..602e4a6447c 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jack_state(machine)); } jack_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/jackal.h b/src/mame/includes/jackal.h index 93f5eb70879..6beee7e5333 100644 --- a/src/mame/includes/jackal.h +++ b/src/mame/includes/jackal.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jackal_state(machine)); } jackal_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoctrl; UINT8 * scrollram; diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index 6e3d61253ee..83eb703dd7b 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jailbrek_state(machine)); } jailbrek_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/jedi.h b/src/mame/includes/jedi.h index a380cfb5cc7..6061d981d90 100644 --- a/src/mame/includes/jedi.h +++ b/src/mame/includes/jedi.h @@ -20,7 +20,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, jedi_state(machine)); } jedi_state(running_machine &machine) { } - + /* machine state */ UINT8 a2d_select; UINT8 nvram_enabled; diff --git a/src/mame/includes/kangaroo.h b/src/mame/includes/kangaroo.h index cfc4f4736f0..fb418704c50 100644 --- a/src/mame/includes/kangaroo.h +++ b/src/mame/includes/kangaroo.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kangaroo_state(machine)); } kangaroo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * video_control; diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 22ccfb6c7dc..427816f4f7d 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, karnov_state(machine)); } karnov_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * ram; diff --git a/src/mame/includes/kchamp.h b/src/mame/includes/kchamp.h index 8305e8c471f..c8d56ec1efd 100644 --- a/src/mame/includes/kchamp.h +++ b/src/mame/includes/kchamp.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kchamp_state(machine)); } kchamp_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index 9f228a282d1..0e6f0ec6124 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kickgoal_state(machine)); } kickgoal_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * fgram; UINT16 * bgram; diff --git a/src/mame/includes/kingobox.h b/src/mame/includes/kingobox.h index 7829b5d3714..18269fe05ca 100644 --- a/src/mame/includes/kingobox.h +++ b/src/mame/includes/kingobox.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kingofb_state(machine)); } kingofb_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/includes/klax.h b/src/mame/includes/klax.h index 631ec8bf4b1..ab0c96ab044 100644 --- a/src/mame/includes/klax.h +++ b/src/mame/includes/klax.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, klax_state(machine)); } klax_state(running_machine &machine) { } - + atarigen_state atarigen; }; diff --git a/src/mame/includes/kncljoe.h b/src/mame/includes/kncljoe.h index b0de1f0c78f..08f719bfe0a 100644 --- a/src/mame/includes/kncljoe.h +++ b/src/mame/includes/kncljoe.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kncljoe_state(machine)); } kncljoe_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/kopunch.h b/src/mame/includes/kopunch.h index d3af7e12113..554b1dd54ed 100644 --- a/src/mame/includes/kopunch.h +++ b/src/mame/includes/kopunch.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kopunch_state(machine)); } kopunch_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/includes/ksayakyu.h b/src/mame/includes/ksayakyu.h index 142cc84af03..a67ddeea015 100644 --- a/src/mame/includes/ksayakyu.h +++ b/src/mame/includes/ksayakyu.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ksayakyu_state(machine)); } ksayakyu_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/kyugo.h b/src/mame/includes/kyugo.h index 78080a3af90..c9ba07cbfc9 100644 --- a/src/mame/includes/kyugo.h +++ b/src/mame/includes/kyugo.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, kyugo_state(machine)); } kyugo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * fgvideoram; UINT8 * bgvideoram; diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h index b0c06c55d44..5018b3b2e48 100644 --- a/src/mame/includes/labyrunr.h +++ b/src/mame/includes/labyrunr.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, labyrunr_state(machine)); } labyrunr_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram1; UINT8 * videoram2; diff --git a/src/mame/includes/ladybug.h b/src/mame/includes/ladybug.h index 3147fcfbfcd..764d30374ff 100644 --- a/src/mame/includes/ladybug.h +++ b/src/mame/includes/ladybug.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ladybug_state(machine)); } ladybug_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index e31066b39d5..80c52bdbb99 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ladyfrog_state(machine)); } ladyfrog_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/laserbat.h b/src/mame/includes/laserbat.h index 4ca67a63e30..2c362308f1e 100644 --- a/src/mame/includes/laserbat.h +++ b/src/mame/includes/laserbat.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, laserbat_state(machine)); } laserbat_state(running_machine &machine) { } - + /* video-related */ tilemap_t *bg_tilemap; UINT8 *videoram; diff --git a/src/mame/includes/lasso.h b/src/mame/includes/lasso.h index d4723c11a40..8af0863bf43 100644 --- a/src/mame/includes/lasso.h +++ b/src/mame/includes/lasso.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lasso_state(machine)); } lasso_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 4c3b358519b..a7675dafea5 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lastduel_state(machine)); } lastduel_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * vram; UINT16 * scroll1; diff --git a/src/mame/includes/lazercmd.h b/src/mame/includes/lazercmd.h index ab05195c298..48b05038615 100644 --- a/src/mame/includes/lazercmd.h +++ b/src/mame/includes/lazercmd.h @@ -23,7 +23,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lazercmd_state(machine)); } lazercmd_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; size_t videoram_size; diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 0c659f45352..feb769782fc 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lemmings_state(machine)); } lemmings_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * pixel_0_data; UINT16 * pixel_1_data; diff --git a/src/mame/includes/lethal.h b/src/mame/includes/lethal.h index 04043e945cd..f7d4c36e57c 100644 --- a/src/mame/includes/lethal.h +++ b/src/mame/includes/lethal.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lethal_state(machine)); } lethal_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/liberate.h b/src/mame/includes/liberate.h index 3f518a9981a..cadfe853ea3 100644 --- a/src/mame/includes/liberate.h +++ b/src/mame/includes/liberate.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, liberate_state(machine)); } liberate_state(running_machine &machine) { } - + UINT8 *videoram; UINT8 *colorram; UINT8 *paletteram; diff --git a/src/mame/includes/lkage.h b/src/mame/includes/lkage.h index cf8b6cfd332..dafb5344cfd 100644 --- a/src/mame/includes/lkage.h +++ b/src/mame/includes/lkage.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lkage_state(machine)); } lkage_state(running_machine &machine) { } - + UINT8 * scroll; UINT8 * vreg; UINT8 * videoram; diff --git a/src/mame/includes/lockon.h b/src/mame/includes/lockon.h index 468928086ec..e68fddea817 100644 --- a/src/mame/includes/lockon.h +++ b/src/mame/includes/lockon.h @@ -21,7 +21,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lockon_state(machine)); } lockon_state(running_machine &machine) { } - + /* memory pointers */ UINT16 *char_ram; UINT16 *hud_ram; diff --git a/src/mame/includes/lsasquad.h b/src/mame/includes/lsasquad.h index 0cfbb88d015..ddfe575b4b6 100644 --- a/src/mame/includes/lsasquad.h +++ b/src/mame/includes/lsasquad.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lsasquad_state(machine)); } lsasquad_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * scrollram; UINT8 * videoram; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 75d81cb37b7..390f55a096c 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, lwings_state(machine)); } lwings_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * fgvideoram; UINT8 * bg1videoram; diff --git a/src/mame/includes/m10.h b/src/mame/includes/m10.h index 7cb2332c317..cf61b35eba9 100644 --- a/src/mame/includes/m10.h +++ b/src/mame/includes/m10.h @@ -33,7 +33,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, m10_state(machine)); } m10_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * chargen; UINT8 * memory; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 42aa864a792..057c4fc6a11 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, macrossp_state(machine)); } macrossp_state(running_machine &machine) { } - + /* memory pointers */ UINT32 * mainram; UINT32 * scra_videoram; diff --git a/src/mame/includes/madmotor.h b/src/mame/includes/madmotor.h index 066926da0cb..ca39cd624b0 100644 --- a/src/mame/includes/madmotor.h +++ b/src/mame/includes/madmotor.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, madmotor_state(machine)); } madmotor_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * pf1_rowscroll; UINT16 * pf1_data; @@ -20,7 +20,7 @@ public: UINT16 * pf2_control; UINT16 * pf3_control; UINT16 * spriteram; -// UINT16 * paletteram; // this currently uses generic palette handlers +// UINT16 * paletteram; // this currently uses generic palette handlers size_t spriteram_size; /* video-related */ diff --git a/src/mame/includes/mainevt.h b/src/mame/includes/mainevt.h index 964032769fc..09ef85309fa 100644 --- a/src/mame/includes/mainevt.h +++ b/src/mame/includes/mainevt.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mainevt_state(machine)); } mainevt_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/malzak.h b/src/mame/includes/malzak.h index 165ff342f38..06537bcbf39 100644 --- a/src/mame/includes/malzak.h +++ b/src/mame/includes/malzak.h @@ -11,7 +11,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, malzak_state(machine)); } malzak_state(running_machine &machine) { } - + /* misc */ // int playfield_x[256]; // int playfield_y[256]; diff --git a/src/mame/includes/mappy.h b/src/mame/includes/mappy.h index 85a394c9af0..869fcc80979 100644 --- a/src/mame/includes/mappy.h +++ b/src/mame/includes/mappy.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mappy_state(machine)); } mappy_state(running_machine &machine) { } - + UINT8 *videoram; UINT8 *spriteram; tilemap_t *bg_tilemap; diff --git a/src/mame/includes/mario.h b/src/mame/includes/mario.h index ec83a12063c..d36cb1042d3 100644 --- a/src/mame/includes/mario.h +++ b/src/mame/includes/mario.h @@ -36,7 +36,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mario_state(machine)); } mario_state(running_machine &machine) { } - + /* memory pointers */ /* machine states */ diff --git a/src/mame/includes/markham.h b/src/mame/includes/markham.h index efbc4c2341e..c3fd260bd90 100644 --- a/src/mame/includes/markham.h +++ b/src/mame/includes/markham.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, markham_state(machine)); } markham_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/matmania.h b/src/mame/includes/matmania.h index df7cd843b1b..c08a8092f66 100644 --- a/src/mame/includes/matmania.h +++ b/src/mame/includes/matmania.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, matmania_state(machine)); } matmania_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * videoram2; diff --git a/src/mame/includes/mcatadv.h b/src/mame/includes/mcatadv.h index 6663d620f81..0da15416fc0 100644 --- a/src/mame/includes/mcatadv.h +++ b/src/mame/includes/mcatadv.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mcatadv_state(machine)); } mcatadv_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram1; UINT16 * videoram2; @@ -15,7 +15,7 @@ public: UINT16 * spriteram_old; UINT16 * vidregs; UINT16 * vidregs_old; -// UINT16 * paletteram; // this currently uses generic palette handlers +// UINT16 * paletteram; // this currently uses generic palette handlers size_t spriteram_size; /* video-related */ diff --git a/src/mame/includes/megazone.h b/src/mame/includes/megazone.h index d06f537f942..fc0ba402618 100644 --- a/src/mame/includes/megazone.h +++ b/src/mame/includes/megazone.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, megazone_state(machine)); } megazone_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * scrollx; UINT8 * scrolly; diff --git a/src/mame/includes/mermaid.h b/src/mame/includes/mermaid.h index 3d4864170f1..7cf5ace9525 100644 --- a/src/mame/includes/mermaid.h +++ b/src/mame/includes/mermaid.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mermaid_state(machine)); } mermaid_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/metalmx.h b/src/mame/includes/metalmx.h index e48535608ef..a4624e094c2 100644 --- a/src/mame/includes/metalmx.h +++ b/src/mame/includes/metalmx.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, metalmx_state(machine)); } metalmx_state(running_machine &machine) { } - + running_device *maincpu; running_device *gsp; running_device *adsp; diff --git a/src/mame/includes/metlclsh.h b/src/mame/includes/metlclsh.h index 0618dc6e980..5063c5a6ade 100644 --- a/src/mame/includes/metlclsh.h +++ b/src/mame/includes/metlclsh.h @@ -10,14 +10,14 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, metlclsh_state(machine)); } metlclsh_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgram; UINT8 * fgram; UINT8 * scrollx; UINT8 * otherram; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram2; // currently this uses generic palette handling UINT8 * spriteram; size_t spriteram_size; diff --git a/src/mame/includes/mexico86.h b/src/mame/includes/mexico86.h index f0ea90e9191..65bef0a70c2 100644 --- a/src/mame/includes/mexico86.h +++ b/src/mame/includes/mexico86.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mexico86_state(machine)); } mexico86_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * protection_ram; UINT8 * videoram; diff --git a/src/mame/includes/micro3d.h b/src/mame/includes/micro3d.h index b38386f3e91..35078175d16 100644 --- a/src/mame/includes/micro3d.h +++ b/src/mame/includes/micro3d.h @@ -17,7 +17,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, micro3d_state(machine)); } micro3d_state(running_machine &machine) { } - + struct { union diff --git a/src/mame/includes/mikie.h b/src/mame/includes/mikie.h index 342dce3e57d..54c30b11f64 100644 --- a/src/mame/includes/mikie.h +++ b/src/mame/includes/mikie.h @@ -1,6 +1,6 @@ /************************************************************************* - Mikie + Mikie *************************************************************************/ @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mikie_state(machine)); } mikie_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/mitchell.h b/src/mame/includes/mitchell.h index dc780b2bc05..193a801168e 100644 --- a/src/mame/includes/mitchell.h +++ b/src/mame/includes/mitchell.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mitchell_state(machine)); } mitchell_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/mjkjidai.h b/src/mame/includes/mjkjidai.h index 63a9890e3ab..cffbf8616e6 100644 --- a/src/mame/includes/mjkjidai.h +++ b/src/mame/includes/mjkjidai.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mjkjidai_state(machine)); } mjkjidai_state(running_machine &machine) { } - + UINT8 *videoram; UINT8 *spriteram1; UINT8 *spriteram2; diff --git a/src/mame/includes/momoko.h b/src/mame/includes/momoko.h index 6c31a6631ad..2e1732bfcc0 100644 --- a/src/mame/includes/momoko.h +++ b/src/mame/includes/momoko.h @@ -10,13 +10,13 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, momoko_state(machine)); } momoko_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bg_scrollx; UINT8 * bg_scrolly; UINT8 * videoram; UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling size_t spriteram_size; size_t videoram_size; diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index ed67732101f..a29f924cbfe 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, moo_state(machine)); } moo_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * workram; UINT16 * spriteram; diff --git a/src/mame/includes/mosaic.h b/src/mame/includes/mosaic.h index 37af2d08bd8..9f145d1b9e8 100644 --- a/src/mame/includes/mosaic.h +++ b/src/mame/includes/mosaic.h @@ -10,11 +10,11 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mosaic_state(machine)); } mosaic_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * fgvideoram; UINT8 * bgvideoram; -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ tilemap_t *bg_tilemap,*fg_tilemap; diff --git a/src/mame/includes/mouser.h b/src/mame/includes/mouser.h index 33c5c5f5188..d2ddc751920 100644 --- a/src/mame/includes/mouser.h +++ b/src/mame/includes/mouser.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mouser_state(machine)); } mouser_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/mrdo.h b/src/mame/includes/mrdo.h index bb2f1a74efb..b74ea45354a 100644 --- a/src/mame/includes/mrdo.h +++ b/src/mame/includes/mrdo.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrdo_state(machine)); } mrdo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * bgvideoram; UINT8 * fgvideoram; diff --git a/src/mame/includes/mrflea.h b/src/mame/includes/mrflea.h index cb7a730a5fb..e5847bf5b38 100644 --- a/src/mame/includes/mrflea.h +++ b/src/mame/includes/mrflea.h @@ -10,11 +10,11 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrflea_state(machine)); } mrflea_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ int gfx_bank; diff --git a/src/mame/includes/mrjong.h b/src/mame/includes/mrjong.h index 863c7150e4c..9aeeb5bf192 100644 --- a/src/mame/includes/mrjong.h +++ b/src/mame/includes/mrjong.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mrjong_state(machine)); } mrjong_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/mugsmash.h b/src/mame/includes/mugsmash.h index 58e047fbc73..919d300d961 100644 --- a/src/mame/includes/mugsmash.h +++ b/src/mame/includes/mugsmash.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mugsmash_state(machine)); } mugsmash_state(running_machine &machine) { } - + UINT16 *videoram1; UINT16 *videoram2; UINT16 *spriteram; diff --git a/src/mame/includes/munchmo.h b/src/mame/includes/munchmo.h index 57ac30c08ff..5109d80d3b0 100644 --- a/src/mame/includes/munchmo.h +++ b/src/mame/includes/munchmo.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, munchmo_state(machine)); } munchmo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * vreg; UINT8 * status_vram; diff --git a/src/mame/includes/mw8080bw.h b/src/mame/includes/mw8080bw.h index 06dd3bf2731..5fa8d5be7f2 100644 --- a/src/mame/includes/mw8080bw.h +++ b/src/mame/includes/mw8080bw.h @@ -36,7 +36,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mw8080bw_state(machine)); } mw8080bw_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * main_ram; UINT8 * colorram; diff --git a/src/mame/includes/mystston.h b/src/mame/includes/mystston.h index 56a00516622..38c54cd0ddb 100644 --- a/src/mame/includes/mystston.h +++ b/src/mame/includes/mystston.h @@ -16,7 +16,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, mystston_state(machine)); } mystston_state(running_machine &machine) { } - + /* machine state */ UINT8 *ay8910_data; UINT8 *ay8910_select; diff --git a/src/mame/includes/n8080.h b/src/mame/includes/n8080.h index 586d523f00b..6f590cf4014 100644 --- a/src/mame/includes/n8080.h +++ b/src/mame/includes/n8080.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, n8080_state(machine)); } n8080_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; // for helifire diff --git a/src/mame/includes/nemesis.h b/src/mame/includes/nemesis.h index f5e792172a0..544d761c653 100644 --- a/src/mame/includes/nemesis.h +++ b/src/mame/includes/nemesis.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, nemesis_state(machine)); } nemesis_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram1; UINT16 * videoram2; diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index 29d2315af8b..884d6bd8d63 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -34,7 +34,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, neogeo_state(machine)); } neogeo_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 *memcard_data; // this currently uses generic handlers // UINT16 *save_ram; // this currently uses generic handlers diff --git a/src/mame/includes/ninjaw.h b/src/mame/includes/ninjaw.h index 43ea0db3ff1..1059e19930f 100644 --- a/src/mame/includes/ninjaw.h +++ b/src/mame/includes/ninjaw.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ninjaw_state(machine)); } ninjaw_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; size_t spriteram_size; diff --git a/src/mame/includes/offtwall.h b/src/mame/includes/offtwall.h index 866eb33f42e..6717fea6306 100644 --- a/src/mame/includes/offtwall.h +++ b/src/mame/includes/offtwall.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, offtwall_state(machine)); } offtwall_state(running_machine &machine) { } - + atarigen_state atarigen; }; diff --git a/src/mame/includes/ohmygod.h b/src/mame/includes/ohmygod.h index 57e22910b7b..b8542f2f6fa 100644 --- a/src/mame/includes/ohmygod.h +++ b/src/mame/includes/ohmygod.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ohmygod_state(machine)); } ohmygod_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; diff --git a/src/mame/includes/oneshot.h b/src/mame/includes/oneshot.h index 5e199c52575..91218eeb4e0 100644 --- a/src/mame/includes/oneshot.h +++ b/src/mame/includes/oneshot.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, oneshot_state(machine)); } oneshot_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * sprites; UINT16 * bg_videoram; diff --git a/src/mame/includes/opwolf.h b/src/mame/includes/opwolf.h index dddb790d326..c590408fda2 100644 --- a/src/mame/includes/opwolf.h +++ b/src/mame/includes/opwolf.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, opwolf_state(machine)); } opwolf_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * cchip_ram; diff --git a/src/mame/includes/orbit.h b/src/mame/includes/orbit.h index 89e46775884..73e656e00a2 100644 --- a/src/mame/includes/orbit.h +++ b/src/mame/includes/orbit.h @@ -21,7 +21,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, orbit_state(machine)); } orbit_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * playfield_ram; UINT8 * sprite_ram; diff --git a/src/mame/includes/othunder.h b/src/mame/includes/othunder.h index 4e89eeb4114..dfeace5abf0 100644 --- a/src/mame/includes/othunder.h +++ b/src/mame/includes/othunder.h @@ -21,7 +21,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, othunder_state(machine)); } othunder_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; size_t spriteram_size; diff --git a/src/mame/includes/overdriv.h b/src/mame/includes/overdriv.h index d8d1557fea1..8f915b6543b 100644 --- a/src/mame/includes/overdriv.h +++ b/src/mame/includes/overdriv.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, overdriv_state(machine)); } overdriv_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/pandoras.h b/src/mame/includes/pandoras.h index 1a3775f42b3..7962aeaf6ce 100644 --- a/src/mame/includes/pandoras.h +++ b/src/mame/includes/pandoras.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pandoras_state(machine)); } pandoras_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/parodius.h b/src/mame/includes/parodius.h index d50d7a1ff70..0f86e66bb3c 100644 --- a/src/mame/includes/parodius.h +++ b/src/mame/includes/parodius.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, parodius_state(machine)); } parodius_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/pass.h b/src/mame/includes/pass.h index 23498a3c701..00aea3dad6a 100644 --- a/src/mame/includes/pass.h +++ b/src/mame/includes/pass.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pass_state(machine)); } pass_state(running_machine &machine) { } - + tilemap_t *bg_tilemap; tilemap_t *fg_tilemap; diff --git a/src/mame/includes/pgm.h b/src/mame/includes/pgm.h index 6cf939283b9..c238d6a487d 100644 --- a/src/mame/includes/pgm.h +++ b/src/mame/includes/pgm.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, pgm_state(machine)); } pgm_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * mainram; // currently this is also used by nvram handler UINT16 * bg_videoram; diff --git a/src/mame/includes/popper.h b/src/mame/includes/popper.h index 854899b67fe..ad17ce3f653 100644 --- a/src/mame/includes/popper.h +++ b/src/mame/includes/popper.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, popper_state(machine)); } popper_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * ol_videoram; diff --git a/src/mame/includes/psikyo.h b/src/mame/includes/psikyo.h index 337081c514d..74f770693ab 100644 --- a/src/mame/includes/psikyo.h +++ b/src/mame/includes/psikyo.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyo_state(machine)); } psikyo_state(running_machine &machine) { } - + /* memory pointers */ UINT32 * vram_0; UINT32 * vram_1; diff --git a/src/mame/includes/psikyo4.h b/src/mame/includes/psikyo4.h index 798f3502899..0a24f1d95e6 100644 --- a/src/mame/includes/psikyo4.h +++ b/src/mame/includes/psikyo4.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyo4_state(machine)); } psikyo4_state(running_machine &machine) { } - + /* memory pointers */ UINT32 * vidregs; UINT32 * paletteram; diff --git a/src/mame/includes/psikyosh.h b/src/mame/includes/psikyosh.h index b6f411c79f4..9970e43324c 100644 --- a/src/mame/includes/psikyosh.h +++ b/src/mame/includes/psikyosh.h @@ -22,7 +22,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, psikyosh_state(machine)); } psikyosh_state(running_machine &machine) { } - + /* memory pointers */ UINT32 * bgram; UINT32 * zoomram; diff --git a/src/mame/includes/qix.h b/src/mame/includes/qix.h index 8c40f6a0d91..f836d06d7e5 100644 --- a/src/mame/includes/qix.h +++ b/src/mame/includes/qix.h @@ -23,7 +23,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, qix_state(machine)); } qix_state(running_machine &machine) { } - + /* machine state */ UINT8 *_68705_port_out; UINT8 *_68705_ddr; diff --git a/src/mame/includes/rainbow.h b/src/mame/includes/rainbow.h index a51c0b25542..82f32a683aa 100644 --- a/src/mame/includes/rainbow.h +++ b/src/mame/includes/rainbow.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rainbow_state(machine)); } rainbow_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/rampart.h b/src/mame/includes/rampart.h index 7cf348b7f90..d78b79773ee 100644 --- a/src/mame/includes/rampart.h +++ b/src/mame/includes/rampart.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rampart_state(machine)); } rampart_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 * bitmap; UINT8 has_mo; diff --git a/src/mame/includes/rastan.h b/src/mame/includes/rastan.h index c1b3a8b48b7..ba07b3a7157 100644 --- a/src/mame/includes/rastan.h +++ b/src/mame/includes/rastan.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rastan_state(machine)); } rastan_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * paletteram; // this currently uses generic palette handlers diff --git a/src/mame/includes/relief.h b/src/mame/includes/relief.h index 88288af850d..29e2199ea8e 100644 --- a/src/mame/includes/relief.h +++ b/src/mame/includes/relief.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, relief_state(machine)); } relief_state(running_machine &machine) { } - + atarigen_state atarigen; UINT8 ym2413_volume; diff --git a/src/mame/includes/rockrage.h b/src/mame/includes/rockrage.h index 395f55da435..3151ab515f1 100644 --- a/src/mame/includes/rockrage.h +++ b/src/mame/includes/rockrage.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rockrage_state(machine)); } rockrage_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * paletteram; diff --git a/src/mame/includes/rollerg.h b/src/mame/includes/rollerg.h index faf123555b2..3e1d8031379 100644 --- a/src/mame/includes/rollerg.h +++ b/src/mame/includes/rollerg.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rollerg_state(machine)); } rollerg_state(running_machine &machine) { } - + /* memory pointers */ // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/rungun.h b/src/mame/includes/rungun.h index 5aeff35800b..4f4221d626b 100644 --- a/src/mame/includes/rungun.h +++ b/src/mame/includes/rungun.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, rungun_state(machine)); } rungun_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * _936_videoram; // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/sbugger.h b/src/mame/includes/sbugger.h index 26805e2f78b..bb6e6fc62c2 100644 --- a/src/mame/includes/sbugger.h +++ b/src/mame/includes/sbugger.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sbugger_state(machine)); } sbugger_state(running_machine &machine) { } - + UINT8 *videoram; UINT8 *videoram_attr; diff --git a/src/mame/includes/sderby.h b/src/mame/includes/sderby.h index fd877766af5..3e4a15e17f7 100644 --- a/src/mame/includes/sderby.h +++ b/src/mame/includes/sderby.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sderby_state(machine)); } sderby_state(running_machine &machine) { } - + UINT16 *spriteram; size_t spriteram_size; diff --git a/src/mame/includes/segas16.h b/src/mame/includes/segas16.h index ef0ec1d8ee7..ead127d5c10 100644 --- a/src/mame/includes/segas16.h +++ b/src/mame/includes/segas16.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, segas1x_state(machine)); } segas1x_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * workram; // this is used in the nvram handler, hence it cannot be added here // UINT16 * paletteram; // this is used in the segaic16 mapper, hence it cannot be added here (yet) diff --git a/src/mame/includes/sf.h b/src/mame/includes/sf.h index 4cfece6d924..835855cb0cd 100644 --- a/src/mame/includes/sf.h +++ b/src/mame/includes/sf.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sf_state(machine)); } sf_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; UINT16 * objectram; diff --git a/src/mame/includes/shadfrce.h b/src/mame/includes/shadfrce.h index f9caec80c87..3f7f95e9d78 100644 --- a/src/mame/includes/shadfrce.h +++ b/src/mame/includes/shadfrce.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shadfrce_state(machine)); } shadfrce_state(running_machine &machine) { } - + tilemap_t *fgtilemap; tilemap_t *bg0tilemap; tilemap_t *bg1tilemap; diff --git a/src/mame/includes/shootout.h b/src/mame/includes/shootout.h index ea7960ef43f..10aa7a19025 100644 --- a/src/mame/includes/shootout.h +++ b/src/mame/includes/shootout.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shootout_state(machine)); } shootout_state(running_machine &machine) { } - + tilemap_t *background; tilemap_t *foreground; UINT8 *spriteram; diff --git a/src/mame/includes/shuuz.h b/src/mame/includes/shuuz.h index 09f0187c783..390e34c9832 100644 --- a/src/mame/includes/shuuz.h +++ b/src/mame/includes/shuuz.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, shuuz_state(machine)); } shuuz_state(running_machine &machine) { } - + atarigen_state atarigen; }; diff --git a/src/mame/includes/sidearms.h b/src/mame/includes/sidearms.h index 798dbb2ba0b..d22ddbe0a58 100644 --- a/src/mame/includes/sidearms.h +++ b/src/mame/includes/sidearms.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sidearms_state(machine)); } sidearms_state(running_machine &machine) { } - + int gameid; UINT8 *videoram; diff --git a/src/mame/includes/sidepckt.h b/src/mame/includes/sidepckt.h index 7fa058e7072..b4f1e663cff 100644 --- a/src/mame/includes/sidepckt.h +++ b/src/mame/includes/sidepckt.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sidepckt_state(machine)); } sidepckt_state(running_machine &machine) { } - + tilemap_t *bg_tilemap; UINT8 *colorram; UINT8 *videoram; diff --git a/src/mame/includes/silkroad.h b/src/mame/includes/silkroad.h index eca6cb56430..fdf09d84bbe 100644 --- a/src/mame/includes/silkroad.h +++ b/src/mame/includes/silkroad.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, silkroad_state(machine)); } silkroad_state(running_machine &machine) { } - + UINT32 *vidram; UINT32 *vidram2; UINT32 *vidram3; diff --git a/src/mame/includes/simpsons.h b/src/mame/includes/simpsons.h index 6e1c73aa733..d0dbd41a7d6 100644 --- a/src/mame/includes/simpsons.h +++ b/src/mame/includes/simpsons.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, simpsons_state(machine)); } simpsons_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; UINT8 * xtraram; diff --git a/src/mame/includes/skullxbo.h b/src/mame/includes/skullxbo.h index 10256eca11a..44d31f67e75 100644 --- a/src/mame/includes/skullxbo.h +++ b/src/mame/includes/skullxbo.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skullxbo_state(machine)); } skullxbo_state(running_machine &machine) { } - + atarigen_state atarigen; }; diff --git a/src/mame/includes/skyfox.h b/src/mame/includes/skyfox.h index 0339701daab..af893f43fe5 100644 --- a/src/mame/includes/skyfox.h +++ b/src/mame/includes/skyfox.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, skyfox_state(machine)); } skyfox_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * spriteram; size_t spriteram_size; diff --git a/src/mame/includes/slapshot.h b/src/mame/includes/slapshot.h index 3e2c5839abc..9778c1ba9d0 100644 --- a/src/mame/includes/slapshot.h +++ b/src/mame/includes/slapshot.h @@ -20,7 +20,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, slapshot_state(machine)); } slapshot_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * color_ram; UINT16 * spriteram; diff --git a/src/mame/includes/sonson.h b/src/mame/includes/sonson.h index e95120252fa..bd08d1b7f41 100644 --- a/src/mame/includes/sonson.h +++ b/src/mame/includes/sonson.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sonson_state(machine)); } sonson_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * colorram; diff --git a/src/mame/includes/spbactn.h b/src/mame/includes/spbactn.h index ba0717c794e..9445c5c0019 100644 --- a/src/mame/includes/spbactn.h +++ b/src/mame/includes/spbactn.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spbactn_state(machine)); } spbactn_state(running_machine &machine) { } - + UINT16 *bgvideoram; UINT16 *fgvideoram; UINT16 *spvideoram; diff --git a/src/mame/includes/spy.h b/src/mame/includes/spy.h index 26f6a415ae7..30718675488 100644 --- a/src/mame/includes/spy.h +++ b/src/mame/includes/spy.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, spy_state(machine)); } spy_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; UINT8 * pmcram; diff --git a/src/mame/includes/srmp2.h b/src/mame/includes/srmp2.h index 7fdf5cfdcf5..0cb420ed554 100644 --- a/src/mame/includes/srmp2.h +++ b/src/mame/includes/srmp2.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, srmp2_state(machine)); } srmp2_state(running_machine &machine) { } - + int color_bank; int gfx_bank; diff --git a/src/mame/includes/sslam.h b/src/mame/includes/sslam.h index f1a50f170ff..94d537d8e61 100644 --- a/src/mame/includes/sslam.h +++ b/src/mame/includes/sslam.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, sslam_state(machine)); } sslam_state(running_machine &machine) { } - + emu_timer *music_timer; int sound; diff --git a/src/mame/includes/stactics.h b/src/mame/includes/stactics.h index 06eb1a8256d..386b2af69c3 100644 --- a/src/mame/includes/stactics.h +++ b/src/mame/includes/stactics.h @@ -13,7 +13,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, stactics_state(machine)); } stactics_state(running_machine &machine) { } - + /* machine state */ int vert_pos; int horiz_pos; diff --git a/src/mame/includes/stlforce.h b/src/mame/includes/stlforce.h index 49b51fc9c85..70e6129a92e 100644 --- a/src/mame/includes/stlforce.h +++ b/src/mame/includes/stlforce.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, stlforce_state(machine)); } stlforce_state(running_machine &machine) { } - + tilemap_t *bg_tilemap; tilemap_t *mlow_tilemap; tilemap_t *mhigh_tilemap; diff --git a/src/mame/includes/suprslam.h b/src/mame/includes/suprslam.h index b647320133e..239d61e48e8 100644 --- a/src/mame/includes/suprslam.h +++ b/src/mame/includes/suprslam.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, suprslam_state(machine)); } suprslam_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * screen_videoram; UINT16 * bg_videoram; diff --git a/src/mame/includes/surpratk.h b/src/mame/includes/surpratk.h index 81eed4b7381..5c3c36e477e 100644 --- a/src/mame/includes/surpratk.h +++ b/src/mame/includes/surpratk.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, surpratk_state(machine)); } surpratk_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/tail2nos.h b/src/mame/includes/tail2nos.h index c94e163dd60..a6a62e27751 100644 --- a/src/mame/includes/tail2nos.h +++ b/src/mame/includes/tail2nos.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tail2nos_state(machine)); } tail2nos_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * bgvideoram; UINT16 * spriteram; diff --git a/src/mame/includes/taito_b.h b/src/mame/includes/taito_b.h index 7d88a071b27..6f5bfc9c9e4 100644 --- a/src/mame/includes/taito_b.h +++ b/src/mame/includes/taito_b.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitob_state(machine)); } taitob_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; UINT16 * pixelram; diff --git a/src/mame/includes/taito_f2.h b/src/mame/includes/taito_f2.h index ca045aac90d..edb9ac723fe 100644 --- a/src/mame/includes/taito_f2.h +++ b/src/mame/includes/taito_f2.h @@ -14,7 +14,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitof2_state(machine)); } taitof2_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * sprite_extension; UINT16 * spriteram; diff --git a/src/mame/includes/taito_h.h b/src/mame/includes/taito_h.h index 780bd03b79b..a10d9f66a3a 100644 --- a/src/mame/includes/taito_h.h +++ b/src/mame/includes/taito_h.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoh_state(machine)); } taitoh_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * m68000_mainram; // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/taito_l.h b/src/mame/includes/taito_l.h index 9072d53f8a9..b479c851c55 100644 --- a/src/mame/includes/taito_l.h +++ b/src/mame/includes/taito_l.h @@ -7,7 +7,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitol_state(machine)); } taitol_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * rambanks; UINT8 * palette_ram; diff --git a/src/mame/includes/taito_o.h b/src/mame/includes/taito_o.h index 68be020f7bb..3e18cb24c15 100644 --- a/src/mame/includes/taito_o.h +++ b/src/mame/includes/taito_o.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoo_state(machine)); } taitoo_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/taito_z.h b/src/mame/includes/taito_z.h index 87d9f127ef3..98d7bcca29b 100644 --- a/src/mame/includes/taito_z.h +++ b/src/mame/includes/taito_z.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoz_state(machine)); } taitoz_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/taitoair.h b/src/mame/includes/taitoair.h index 3b199ad0705..49514ba521e 100644 --- a/src/mame/includes/taitoair.h +++ b/src/mame/includes/taitoair.h @@ -23,7 +23,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitoair_state(machine)); } taitoair_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * m68000_mainram; UINT16 * line_ram; diff --git a/src/mame/includes/taitojc.h b/src/mame/includes/taitojc.h index cbc312a96f2..1b0db21276f 100644 --- a/src/mame/includes/taitojc.h +++ b/src/mame/includes/taitojc.h @@ -6,7 +6,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, taitojc_state(machine)); } taitojc_state(running_machine &machine) { } - + int texture_x; int texture_y; diff --git a/src/mame/includes/thunderj.h b/src/mame/includes/thunderj.h index ba83d9a24c9..dd3d01234ab 100644 --- a/src/mame/includes/thunderj.h +++ b/src/mame/includes/thunderj.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, thunderj_state(machine)); } thunderj_state(running_machine &machine) { } - + atarigen_state atarigen; UINT8 alpha_tile_bank; }; diff --git a/src/mame/includes/thunderx.h b/src/mame/includes/thunderx.h index d13023339e3..d22e1a3c1ae 100644 --- a/src/mame/includes/thunderx.h +++ b/src/mame/includes/thunderx.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, thunderx_state(machine)); } thunderx_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; UINT8 * pmcram; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index eea0e1541ea..e980c304b44 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -25,7 +25,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, timeplt_state(machine)); } timeplt_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; // timeplt, tutankham, junofrst, rocnrope, pooyan, rallyx UINT8 * colorram; // timeplt, rocnrope, pooyan diff --git a/src/mame/includes/tmnt.h b/src/mame/includes/tmnt.h index d4436cf4e3d..b446b48029a 100644 --- a/src/mame/includes/tmnt.h +++ b/src/mame/includes/tmnt.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tmnt_state(machine)); } tmnt_state(running_machine &machine) { } - + /* memory pointers */ INT16 * sampledata; UINT16 * tmnt2_1c0800; diff --git a/src/mame/includes/tnzs.h b/src/mame/includes/tnzs.h index 1c26d0ede1e..faa40578943 100644 --- a/src/mame/includes/tnzs.h +++ b/src/mame/includes/tnzs.h @@ -21,7 +21,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tnzs_state(machine)); } tnzs_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * objram; UINT8 * vdcram; diff --git a/src/mame/includes/toobin.h b/src/mame/includes/toobin.h index 5142736fc3f..718478a2188 100644 --- a/src/mame/includes/toobin.h +++ b/src/mame/includes/toobin.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toobin_state(machine)); } toobin_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 * interrupt_scan; diff --git a/src/mame/includes/topspeed.h b/src/mame/includes/topspeed.h index a26fa2a651c..9d8065d39cd 100644 --- a/src/mame/includes/topspeed.h +++ b/src/mame/includes/topspeed.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, topspeed_state(machine)); } topspeed_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spritemap; UINT16 * raster_ctrl; diff --git a/src/mame/includes/toypop.h b/src/mame/includes/toypop.h index ed0c6787556..8f72cd2e475 100644 --- a/src/mame/includes/toypop.h +++ b/src/mame/includes/toypop.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, toypop_state(machine)); } toypop_state(running_machine &machine) { } - + UINT8 *videoram; UINT8 *spriteram; UINT16 *bg_image; diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 69ee6da9e2e..b2191172ce0 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -14,7 +14,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, trackfld_state(machine)); } trackfld_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; // trackfld, hyperspt, yiear, sbasketb UINT8 * colorram; // trackfld, hyperspt, sbasketb diff --git a/src/mame/includes/tunhunt.h b/src/mame/includes/tunhunt.h index 2e4a4ab0be7..e32b0834f67 100644 --- a/src/mame/includes/tunhunt.h +++ b/src/mame/includes/tunhunt.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, tunhunt_state(machine)); } tunhunt_state(running_machine &machine) { } - + UINT8 control; UINT8 *workram; UINT8 *spriteram; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index b7fc83210fa..32a20ef60ad 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -28,7 +28,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, turbo_state(machine)); } turbo_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; UINT8 * spriteram; diff --git a/src/mame/includes/ultraman.h b/src/mame/includes/ultraman.h index 5bcd1f4e722..11c12451e33 100644 --- a/src/mame/includes/ultraman.h +++ b/src/mame/includes/ultraman.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, ultraman_state(machine)); } ultraman_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/vastar.h b/src/mame/includes/vastar.h index 136420ffde3..5849da78865 100644 --- a/src/mame/includes/vastar.h +++ b/src/mame/includes/vastar.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vastar_state(machine)); } vastar_state(running_machine &machine) { } - + UINT8 *spriteram1; UINT8 *spriteram2; UINT8 *spriteram3; diff --git a/src/mame/includes/vendetta.h b/src/mame/includes/vendetta.h index b4f669e51d0..94e13ecf2f8 100644 --- a/src/mame/includes/vendetta.h +++ b/src/mame/includes/vendetta.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vendetta_state(machine)); } vendetta_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * ram; // UINT8 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/vindictr.h b/src/mame/includes/vindictr.h index ca31ece6ece..bb50f4d4452 100644 --- a/src/mame/includes/vindictr.h +++ b/src/mame/includes/vindictr.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, vindictr_state(machine)); } vindictr_state(running_machine &machine) { } - + atarigen_state atarigen; UINT8 playfield_tile_bank; diff --git a/src/mame/includes/volfied.h b/src/mame/includes/volfied.h index 89a2a8d6c1a..c3bfbb0f720 100644 --- a/src/mame/includes/volfied.h +++ b/src/mame/includes/volfied.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, volfied_state(machine)); } volfied_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * video_ram; UINT8 * cchip_ram; diff --git a/src/mame/includes/warriorb.h b/src/mame/includes/warriorb.h index 4442f3679ed..99d0e62684e 100644 --- a/src/mame/includes/warriorb.h +++ b/src/mame/includes/warriorb.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, warriorb_state(machine)); } warriorb_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spriteram; size_t spriteram_size; diff --git a/src/mame/includes/welltris.h b/src/mame/includes/welltris.h index 5ea1908a1d4..9e8824f2811 100644 --- a/src/mame/includes/welltris.h +++ b/src/mame/includes/welltris.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, welltris_state(machine)); } welltris_state(running_machine &machine) { } - + int pending_command; UINT16 *spriteram; diff --git a/src/mame/includes/wgp.h b/src/mame/includes/wgp.h index 2e008b98beb..c1f6b2586a0 100644 --- a/src/mame/includes/wgp.h +++ b/src/mame/includes/wgp.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, wgp_state(machine)); } wgp_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * spritemap; UINT16 * spriteram; diff --git a/src/mame/includes/wwfsstar.h b/src/mame/includes/wwfsstar.h index 6a61afbf8b5..cf99490ab9a 100644 --- a/src/mame/includes/wwfsstar.h +++ b/src/mame/includes/wwfsstar.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, wwfsstar_state(machine)); } wwfsstar_state(running_machine &machine) { } - + int vblank; int scrollx; int scrolly; diff --git a/src/mame/includes/xexex.h b/src/mame/includes/xexex.h index c3d6ec5ff97..e9631b51c99 100644 --- a/src/mame/includes/xexex.h +++ b/src/mame/includes/xexex.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xexex_state(machine)); } xexex_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * workram; UINT16 * spriteram; diff --git a/src/mame/includes/xmen.h b/src/mame/includes/xmen.h index 18feb7f9970..ef784e63d01 100644 --- a/src/mame/includes/xmen.h +++ b/src/mame/includes/xmen.h @@ -5,7 +5,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xmen_state(machine)); } xmen_state(running_machine &machine) { } - + /* memory pointers */ // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/includes/xybots.h b/src/mame/includes/xybots.h index d02f4ebdffa..0f806b2d867 100644 --- a/src/mame/includes/xybots.h +++ b/src/mame/includes/xybots.h @@ -12,7 +12,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xybots_state(machine)); } xybots_state(running_machine &machine) { } - + atarigen_state atarigen; UINT16 h256; diff --git a/src/mame/includes/xyonix.h b/src/mame/includes/xyonix.h index 917539c6357..b76f5d04f89 100644 --- a/src/mame/includes/xyonix.h +++ b/src/mame/includes/xyonix.h @@ -4,7 +4,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, xyonix_state(machine)); } xyonix_state(running_machine &machine) { } - + UINT8 *vidram; tilemap_t *tilemap; diff --git a/src/mame/includes/yunsun16.h b/src/mame/includes/yunsun16.h index 55983e327f8..e17cb0eab09 100644 --- a/src/mame/includes/yunsun16.h +++ b/src/mame/includes/yunsun16.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, yunsun16_state(machine)); } yunsun16_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * vram_0; UINT16 * vram_1; diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 84f744cdc8a..b5fe0ce8889 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, yunsung8_state(machine)); } yunsung8_state(running_machine &machine) { } - + /* memory pointers */ UINT8 * videoram; diff --git a/src/mame/includes/zaxxon.h b/src/mame/includes/zaxxon.h index a6ec92b39ef..f3779bf5f55 100644 --- a/src/mame/includes/zaxxon.h +++ b/src/mame/includes/zaxxon.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, zaxxon_state(machine)); } zaxxon_state(running_machine &machine) { } - + UINT8 *colorram; UINT8 *videoram; UINT8 *spriteram; diff --git a/src/mame/includes/zerozone.h b/src/mame/includes/zerozone.h index 0117502e217..4a2e51a7cc4 100644 --- a/src/mame/includes/zerozone.h +++ b/src/mame/includes/zerozone.h @@ -10,7 +10,7 @@ public: static void *alloc(running_machine &machine) { return auto_alloc_clear(&machine, zerozone_state(machine)); } zerozone_state(running_machine &machine) { } - + /* memory pointers */ UINT16 * videoram; // UINT16 * paletteram; // currently this uses generic palette handling diff --git a/src/mame/machine/lkage.c b/src/mame/machine/lkage.c index 90e36c1b676..3f544547ce8 100644 --- a/src/mame/machine/lkage.c +++ b/src/mame/machine/lkage.c @@ -68,7 +68,7 @@ WRITE8_HANDLER( lkage_68705_port_b_w ) if ((state->ddr_b & 0x02) && (~data & 0x02) && (state->port_b_out & 0x02)) { state->port_a_in = state->from_main; - if (state->main_sent) + if (state->main_sent) cpu_set_input_line(state->mcu, 0, CLEAR_LINE); state->main_sent = 0; @@ -98,9 +98,9 @@ READ8_HANDLER( lkage_68705_port_c_r ) lkage_state *state = (lkage_state *)space->machine->driver_data; state->port_c_in = 0; - if (state->main_sent) + if (state->main_sent) state->port_c_in |= 0x01; - if (!state->mcu_sent) + if (!state->mcu_sent) state->port_c_in |= 0x02; //logerror("%04x: 68705 port C read %02x\n", cpu_get_pc(space->cpu), state->port_c_in); @@ -149,9 +149,9 @@ READ8_HANDLER( lkage_mcu_status_r ) /* bit 0 = when 1, mcu is ready to receive data from main cpu */ /* bit 1 = when 1, mcu has sent data to the main cpu */ //logerror("%04x: mcu_status_r\n", cpu_get_pc(space->cpu)); - if (!state->main_sent) + if (!state->main_sent) res |= 0x01; - if (state->mcu_sent) + if (state->mcu_sent) res |= 0x02; return res; diff --git a/src/mame/machine/lsasquad.c b/src/mame/machine/lsasquad.c index 3f0bdb46823..cdccec7f72d 100644 --- a/src/mame/machine/lsasquad.c +++ b/src/mame/machine/lsasquad.c @@ -12,9 +12,9 @@ static TIMER_CALLBACK( nmi_callback ) { lsasquad_state *state = (lsasquad_state *)machine->driver_data; - if (state->sound_nmi_enable) + if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); - else + else state->pending_nmi = 1; } @@ -155,7 +155,7 @@ WRITE8_HANDLER( lsasquad_68705_port_b_w ) if ((state->ddr_b & 0x02) && (~data & 0x02) && (state->port_b_out & 0x02)) { state->port_a_in = state->from_main; - if (state->main_sent) + if (state->main_sent) cpu_set_input_line(state->mcu, 0, CLEAR_LINE); state->main_sent = 0; //logerror("read command %02x from main cpu\n", state->port_a_in); @@ -204,9 +204,9 @@ READ8_HANDLER( lsasquad_mcu_status_r ) /* bit 0 = when 1, mcu is ready to receive data from main cpu */ /* bit 1 = when 0, mcu has sent data to the main cpu */ //logerror("%04x: mcu_status_r\n",cpu_get_pc(space->cpu)); - if (!state->main_sent) + if (!state->main_sent) res |= 0x01; - if (!state->mcu_sent) + if (!state->mcu_sent) res |= 0x02; return res ^ state->invertcoin; diff --git a/src/mame/machine/maniach.c b/src/mame/machine/maniach.c index 1e3a6b15b6e..f5397aa412b 100644 --- a/src/mame/machine/maniach.c +++ b/src/mame/machine/maniach.c @@ -93,10 +93,10 @@ READ8_HANDLER( maniach_68705_port_c_r ) state->port_c_in = 0; - if (state->main_sent) + if (state->main_sent) state->port_c_in |= 0x01; - if (!state->mcu_sent) + if (!state->mcu_sent) state->port_c_in |= 0x02; //logerror("%04x: 68705 port C read %02x\n",state->cpu_get_pc(space->cpu), state->port_c_in); @@ -145,9 +145,9 @@ READ8_HANDLER( maniach_mcu_status_r ) /* bit 0 = when 0, mcu has sent data to the main cpu */ /* bit 1 = when 1, mcu is ready to receive data from main cpu */ //logerror("%04x: 3041_r\n", cpu_get_pc(space->cpu)); - if (!state->mcu_sent) + if (!state->mcu_sent) res |= 0x01; - if (!state->main_sent) + if (!state->main_sent) res |= 0x02; return res; diff --git a/src/mame/machine/naomi.c b/src/mame/machine/naomi.c index 63812850323..d8c734d3511 100644 --- a/src/mame/machine/naomi.c +++ b/src/mame/machine/naomi.c @@ -34,12 +34,12 @@ static UINT8 asciihex_to_dec(UINT8 in) return in - 0x37; } /* - else - if (in>=0x61 && in<=0x66) - { - return in - 0x57; - } - */ + else + if (in>=0x61 && in<=0x66) + { + return in - 0x57; + } + */ else { fatalerror("unexpected value in asciihex_to_dec"); @@ -79,10 +79,10 @@ static void create_pic_from_retdat(running_machine* machine) UINT8 dec2 = asciihex_to_dec(ascii2); UINT8 val = dec1 << 4 | dec2; - //printf("%02x%02x", ascii1, ascii2); - + //printf("%02x%02x", ascii1, ascii2); + printf("%02x", val); - + newregion[outcount] = val; hexoffs+=2; @@ -90,12 +90,12 @@ static void create_pic_from_retdat(running_machine* machine) } hexoffs+=0x4; // skip running checksum + newline - + printf("\n"); } - + { int i; printf("string 1 (key1)\n"); @@ -130,8 +130,8 @@ static void create_pic_from_retdat(running_machine* machine) newregion[0x7e0+i*2] = retregion[0x19+i]; // patch with extracted data } } - - + + { FILE *fp; char filename[256]; @@ -149,7 +149,7 @@ static void create_pic_from_retdat(running_machine* machine) // hex dumps end with //:10400000000000000000000000000000000082002E //:00000001FF - + } } diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c index a831764a789..ce104bb1ef5 100644 --- a/src/mame/machine/naomibd.c +++ b/src/mame/machine/naomibd.c @@ -238,35 +238,35 @@ static const naomibd_config_table naomibd_translate_tbl[] = { // games where on-the-fly decryption works (many of these are fully playable in MAME, just slow) { "18wheelr", 0, 0x7cf54, { 0x1502, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "alpilota", 0, 0x70e41, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "alpiltdx", 0, 0x70e41, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "alpilota", 0, 0x70e41, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "alpiltdx", 0, 0x70e41, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, { "capsnk", 0, 0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, { "capsnka", 0, 0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, { "crzytaxi", 0, 0xd2f45, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, { "csmash", 1, 0x03347, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, { "csmasho", 1, 0x03347, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "cspike", 0, 0xe2010, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "deathcox", 0, 0xb64d0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "dybb99", 0, 0x48a01, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "f355twin", 0, 0x6efd4, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "f355twn2", 0, 0x666c6, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "ggram2", 0, 0x74a61, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "gwing2", 0, 0xb25d0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "hmgeo", 0, 0x38510, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "cspike", 0, 0xe2010, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "deathcox", 0, 0xb64d0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "dybb99", 0, 0x48a01, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "f355twin", 0, 0x6efd4, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "f355twn2", 0, 0x666c6, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "ggram2", 0, 0x74a61, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "gwing2", 0, 0xb25d0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "hmgeo", 0, 0x38510, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, { "jambo", 0, 0xfab95, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "otrigger", 0, 0xfea94, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "pjustic", 0, 0x725d0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "pstone", 0, 0xe69c1, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "pstone2", 0, 0xb8dc0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "samba", 0, 0xa8b5d, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "slasho", 0, 0xa66ca, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "smlg99", 0, 0x48a01, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "spawn", 0, 0x78d01, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "suchie3", 0, 0x368e1, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "toyfight", 0, 0x2ca85, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "vtennis", 0, 0x3eb15, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "otrigger", 0, 0xfea94, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "pjustic", 0, 0x725d0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "pstone", 0, 0xe69c1, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "pstone2", 0, 0xb8dc0, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "samba", 0, 0xa8b5d, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "slasho", 0, 0xa66ca, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "smlg99", 0, 0x48a01, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "spawn", 0, 0x78d01, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "suchie3", 0, 0x368e1, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "toyfight", 0, 0x2ca85, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "vtennis", 0, 0x3eb15, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, { "wwfroyal",0, 0x627c3, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "zombrvn", 0, 0x12b41, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "zombrvn", 0, 0x12b41, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, // games where the encryption is stacked with the ASIC's compression { "doa2", 0, -1, { -1, 0x500, 0, -1, 0x20504, 0x20000, -1, 0x40508, 0x40000, -1, 0x6050c, 0x60000, -1, 0x80510, 0x80000, // 0x8ad01, has compression @@ -284,8 +284,8 @@ static const naomibd_config_table naomibd_translate_tbl[] = 0xdd19, 0, 0x0c0000, 0x2428, 0, 0x0d0000, 0x3329, 0, 0x0e0000, 0x2142, 0, 0x0f0000, 0xffffffff, 0xffffffff, 0xffffffff } }, { "sgtetris", 0, -1, { 0x1234, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, // 0x8ae51, uses compression -// { "virnbao", 0, 0x68b58, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, // note: "virnba" set doesn't have protection -// { "vs2_2k", 0, 0x88b08, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, +// { "virnbao", 0, 0x68b58, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, // note: "virnba" set doesn't have protection +// { "vs2_2k", 0, 0x88b08, { 0, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, }; // forward declaration for decrypt function @@ -1500,7 +1500,7 @@ static int feistel_function(int input, const struct sbox* sboxes, UINT32 subkeys int k,m; int aux; int result=0; - + for (m=0; m<4; ++m) // 4 sboxes { for (k=0, aux=0; k<6; ++k) @@ -1510,17 +1510,17 @@ static int feistel_function(int input, const struct sbox* sboxes, UINT32 subkeys aux |= (BIT(input, sboxes[m].inputs[k])<>=6; } - + return result; } @@ -1656,16 +1656,16 @@ static void stream_decrypt(UINT32 game_key, UINT32 sequence_key, UINT16 seed, UI UINT16 aux_word; int control_bits; UINT16 heading_word; - + last_word = block_decrypt(game_key, sequence_key, counter, *ciphertext<<8 | *(ciphertext+1)); control_bits = last_word&3; ++counter; ciphertext+=2; - + aux_word = block_decrypt(game_key, sequence_key, counter, *ciphertext<<8 | *(ciphertext+1)); heading_word = (last_word&~3) | (aux_word&3); last_word = aux_word; ++counter; ciphertext+=2; - + if (BIT(control_bits,1)==0) // no decompression, just decryption { for (; length>0; length-=2, ++counter, ciphertext+=2) diff --git a/src/mame/machine/nitedrvr.c b/src/mame/machine/nitedrvr.c index e2c7fb60f60..27224ade1f1 100644 --- a/src/mame/machine/nitedrvr.c +++ b/src/mame/machine/nitedrvr.c @@ -26,9 +26,9 @@ static int nitedrvr_steering( running_machine *machine ) state->last_steering_val = this_val; - if (delta > 128) + if (delta > 128) delta -= 256; - else if (delta < -128) + else if (delta < -128) delta += 256; /* Divide by four to make our steering less sensitive */ @@ -115,13 +115,13 @@ READ8_HANDLER( nitedrvr_in0_r ) case 0x01: /* No remapping necessary */ return input_port_read(space->machine, "DSW1"); case 0x02: /* Remap our gear shift */ - if (state->gear == 1) + if (state->gear == 1) return 0xe0; - else if (state->gear == 2) + else if (state->gear == 2) return 0xd0; - else if (state->gear == 3) + else if (state->gear == 3) return 0xb0; - else + else return 0x70; case 0x03: /* Remap our steering */ return (input_port_read(space->machine, "DSW2") | nitedrvr_steering(space->machine)); @@ -262,7 +262,7 @@ TIMER_DEVICE_CALLBACK( nitedrvr_crash_toggle_callback ) { state->crash_data--; discrete_sound_w(state->discrete, NITEDRVR_BANG_DATA, state->crash_data); // Crash Volume - if (!state->crash_data) + if (!state->crash_data) state->crash_data_en = 0; // Done counting? if (state->crash_data & 0x01) diff --git a/src/mame/machine/nycaptor.c b/src/mame/machine/nycaptor.c index 7738f5bed0f..14ded76f62f 100644 --- a/src/mame/machine/nycaptor.c +++ b/src/mame/machine/nycaptor.c @@ -51,7 +51,7 @@ WRITE8_HANDLER( nycaptor_68705_port_b_w ) { state->port_a_in = state->from_main; - if (state->main_sent) + if (state->main_sent) cpu_set_input_line(state->mcu, 0, CLEAR_LINE); state->main_sent = 0; @@ -78,9 +78,9 @@ READ8_HANDLER( nycaptor_68705_port_c_r ) nycaptor_state *state = (nycaptor_state *)space->machine->driver_data; state->port_c_in = 0; - if (state->main_sent) + if (state->main_sent) state->port_c_in |= 0x01; - if (!state->mcu_sent) + if (!state->mcu_sent) state->port_c_in |= 0x02; return (state->port_c_out & state->ddr_c) | (state->port_c_in & ~state->ddr_c); diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 9c7ad3a28da..0545418781a 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -295,8 +295,8 @@ static TIMER_CALLBACK( snes_hblank_tick ) timer_adjust_oneshot(snes_scanline_timer, video_screen_get_time_until_pos(machine->primary_screen, nextscan, 0), 0); } -/* FIXME: multiplication should take 8 CPU cycles & division 16 CPU cycles, but -using these timers breaks e.g. Chrono Trigger intro and Super Tennis gameplay. +/* FIXME: multiplication should take 8 CPU cycles & division 16 CPU cycles, but +using these timers breaks e.g. Chrono Trigger intro and Super Tennis gameplay. On the other hand, timers are needed for the translation of Breath of Fire 2 to work. More weirdness: we might need to leave 8 CPU cycles for division at first, since using 16 produces bugs (see e.g. Triforce pieces in Zelda 3 intro) */ @@ -1329,7 +1329,7 @@ WRITE8_HANDLER( snes_w_io ) break; case WRMPYB: /* Multiplier B */ snes_ram[WRMPYB] = data; -// timer_adjust_oneshot(snes_mult_timer, cputag_clocks_to_attotime(space->machine, "maincpu", 8), 0); +// timer_adjust_oneshot(snes_mult_timer, cputag_clocks_to_attotime(space->machine, "maincpu", 8), 0); { UINT32 c = snes_ram[WRMPYA] * snes_ram[WRMPYB]; snes_ram[RDMPYL] = c & 0xff; @@ -1341,7 +1341,7 @@ WRITE8_HANDLER( snes_w_io ) break; case WRDVDD: /* Divisor */ snes_ram[WRDVDD] = data; -// timer_adjust_oneshot(snes_div_timer, cputag_clocks_to_attotime(space->machine, "maincpu", 16), 0); +// timer_adjust_oneshot(snes_div_timer, cputag_clocks_to_attotime(space->machine, "maincpu", 16), 0); { UINT16 value, dividend, remainder; dividend = remainder = 0; diff --git a/src/mame/video/avgdvg.c b/src/mame/video/avgdvg.c index 9c520f61def..57970928cda 100644 --- a/src/mame/video/avgdvg.c +++ b/src/mame/video/avgdvg.c @@ -1140,11 +1140,11 @@ static void tempest_vggo(vgdata *vg) vg->pc = 0; vg->sp = 0; /* - * Tempest and Quantum trigger VGGO from time to time even though - * the VG runs in an endless loop for these games (see - * avg_common_strobe2). If we don't discard all vectors in the - * current buffer at this point, the screen starts flickering. - */ + * Tempest and Quantum trigger VGGO from time to time even though + * the VG runs in an endless loop for these games (see + * avg_common_strobe2). If we don't discard all vectors in the + * current buffer at this point, the screen starts flickering. + */ nvect = 0; } diff --git a/src/mame/video/boogwing.c b/src/mame/video/boogwing.c index 07140c9c8bb..9914f01d09d 100644 --- a/src/mame/video/boogwing.c +++ b/src/mame/video/boogwing.c @@ -15,12 +15,12 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int alpha = 0xff; sprite = spriteram_base[offs + 1]; - if (!sprite) + if (!sprite) continue; y = spriteram_base[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram_base[offs + 2]; @@ -118,7 +118,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect if (fy) fy = 0; else fy = 1; mult = 16; } - else + else mult = -16; while (multi >= 0) diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c index dde7e571c0f..d81734d06a2 100644 --- a/src/mame/video/cbuster.c +++ b/src/mame/video/cbuster.c @@ -46,23 +46,23 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = buffered_spriteram[offs + 1] & 0x7fff; - if (!sprite) + if (!sprite) continue; y = buffered_spriteram[offs]; x = buffered_spriteram[offs + 2]; - if ((y & 0x8000) && pri == 1) + if ((y & 0x8000) && pri == 1) continue; - if (!(y & 0x8000) && pri == 0) + if (!(y & 0x8000) && pri == 0) continue; colour = (x >> 9) & 0xf; - if (x & 0x2000) + if (x & 0x2000) colour += 64; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; fx = y & 0x2000; @@ -76,7 +76,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect x = 240 - x; y = 240 - y; - if (x > 256) + if (x > 256) continue; /* Speedup */ sprite &= ~multi; @@ -88,7 +88,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect inc = 1; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { y = 240 - y; x = 240 - x; @@ -127,12 +127,12 @@ VIDEO_UPDATE( twocrude ) deco16ic_tilemap_4_draw(state->deco16ic, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); draw_sprites(screen->machine, bitmap, cliprect, 0); - if (state->pri) + if (state->pri) { deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 0); deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, 0, 0); } - else + else { deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, 0, 0); deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 0); diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index 26ebcc6601a..d5b3454289a 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -32,13 +32,13 @@ static void cninja_draw_sprites( running_machine *machine, bitmap_t *bitmap, con int x, y, sprite, colour, multi, fx, fy, inc, flash, mult, pri = 0; sprite = buffered_spriteram[offs + 1]; - if (!sprite) + if (!sprite) continue; x = buffered_spriteram[offs + 2]; /* Sprite/playfield priority */ - switch (x & 0xc000) + switch (x & 0xc000) { case 0x0000: pri = 0; break; case 0x4000: pri = 0xf0; break; @@ -48,7 +48,7 @@ static void cninja_draw_sprites( running_machine *machine, bitmap_t *bitmap, con y = buffered_spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; colour = (x >> 9) & 0x1f; @@ -73,7 +73,7 @@ static void cninja_draw_sprites( running_machine *machine, bitmap_t *bitmap, con inc = 1; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { y = 240 - y; x = 240 - x; @@ -81,7 +81,7 @@ static void cninja_draw_sprites( running_machine *machine, bitmap_t *bitmap, con if (fy) fy = 0; else fy = 1; mult = 16; } - else + else mult = -16; while (multi >= 0) @@ -126,13 +126,13 @@ static void cninjabl_draw_sprites( running_machine *machine, bitmap_t *bitmap, c sprite = buffered_spriteram[offs + 0]; // changed on bootleg! y = buffered_spriteram[offs + 1]; // changed on bootleg! - if (!sprite) + if (!sprite) continue; x = buffered_spriteram[offs + 2]; /* Sprite/playfield priority */ - switch (x & 0xc000) + switch (x & 0xc000) { case 0x0000: pri = 0; break; case 0x4000: pri = 0xf0; break; @@ -141,7 +141,7 @@ static void cninjabl_draw_sprites( running_machine *machine, bitmap_t *bitmap, c } flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; colour = (x >> 9) & 0x1f; @@ -170,7 +170,7 @@ static void cninjabl_draw_sprites( running_machine *machine, bitmap_t *bitmap, c inc = 1; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { y = 240 - y; x = 240 - x; @@ -178,7 +178,7 @@ static void cninjabl_draw_sprites( running_machine *machine, bitmap_t *bitmap, c if (fy) fy = 0; else fy = 1; mult = 16; } - else + else mult = -16; while (multi >= 0) @@ -205,13 +205,13 @@ static void robocop2_draw_sprites( running_machine *machine, bitmap_t *bitmap, c { int x, y, sprite, colour, multi, fx, fy, inc, flash, mult, pri = 0; sprite = buffered_spriteram[offs + 1]; - if (!sprite) + if (!sprite) continue; x = buffered_spriteram[offs + 2]; /* Sprite/playfield priority */ - switch (x & 0xc000) + switch (x & 0xc000) { case 0x0000: pri = 0; break; case 0x4000: pri = 0xf0; break; @@ -221,7 +221,7 @@ static void robocop2_draw_sprites( running_machine *machine, bitmap_t *bitmap, c y = buffered_spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; colour = (x >> 9) & 0x1f; @@ -245,7 +245,7 @@ static void robocop2_draw_sprites( running_machine *machine, bitmap_t *bitmap, c inc = 1; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { y = 240 - y; x = 304 - x; @@ -253,7 +253,7 @@ static void robocop2_draw_sprites( running_machine *machine, bitmap_t *bitmap, c if (fy) fy = 0; else fy = 1; mult = 16; } - else + else mult = -16; while (multi >= 0) @@ -295,13 +295,13 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co /* This may look strange, but the alpha-blended sprite chip definitely draws end to front, ie, reversed from normal pdrawgfx style. */ - if (gfxbank == 4) + if (gfxbank == 4) { offs = 0; end = 0x400; inc = 4; - } - else + } + else { offs = 0x3fc; end = -4; @@ -314,7 +314,7 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co int alpha = 0xff; sprite = spriteptr[offs + 3]; - if (!sprite) + if (!sprite) { offs += inc; continue; @@ -326,7 +326,7 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co w = (spriteptr[offs + 2] & 0x0f00) >> 8; sy = spriteptr[offs]; - if ((sy & 0x2000) && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if ((sy & 0x2000) && (video_screen_get_frame_number(machine->primary_screen) & 1)) { offs += inc; continue; @@ -334,7 +334,7 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co colour = (spriteptr[offs + 2] >> 0) & 0x1f; - if (gfxbank == 4) + if (gfxbank == 4) { /* Seems to be always alpha'd */ alpha = 0x80; colour &= 0xf; @@ -343,7 +343,7 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co fx = (spriteptr[offs + 0] & 0x4000); fy = (spriteptr[offs + 0] & 0x8000); - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { if (fx) fx = 0; else fx = 1; if (fy) fy = 0; else fy = 1; @@ -355,8 +355,8 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co if (fx) { x_mult = -16; sx += 16 * w; } else { x_mult = 16; sx -= 16; } if (fy) { y_mult = -16; sy += 16 * h; } else { y_mult = 16; sy -= 16; } - } - else + } + else { sx = sx & 0x01ff; sy = sy & 0x01ff; @@ -370,9 +370,9 @@ static void mutantf_draw_sprites( running_machine *machine, bitmap_t *bitmap, co if (fy) { y_mult = -16; sy += 16; } else { y_mult = 16; sy -= 16*h; } } - for (x = 0; x < w; x++) + for (x = 0; x < w; x++) { - for (y = 0; y < h; y++) + for (y = 0; y < h; y++) { pdrawgfx_alpha(bitmap,cliprect,machine->gfx[gfxbank], sprite + y + h * x, @@ -457,13 +457,13 @@ VIDEO_UPDATE( robocop2 ) UINT16 priority = deco16ic_priority_r(state->deco16ic, 0, 0xffff); /* One of the tilemap chips can switch between 2 tilemaps at 4bpp, or 1 at 8bpp */ - if (priority & 4) + if (priority & 4) { deco16ic_set_tilemap_colour_mask(state->deco16ic, 2, 0); deco16ic_set_tilemap_colour_mask(state->deco16ic, 3, 0); deco16ic_pf34_set_gfxbank(state->deco16ic, 0, 4); - } - else + } + else { deco16ic_set_tilemap_colour_mask(state->deco16ic, 2, 0xf); deco16ic_set_tilemap_colour_mask(state->deco16ic, 3, 0xf); @@ -483,7 +483,7 @@ VIDEO_UPDATE( robocop2 ) deco16ic_tilemap_4_draw(state->deco16ic, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 1); /* Switchable priority */ - switch (priority & 0x8) + switch (priority & 0x8) { case 8: deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 2); @@ -535,14 +535,14 @@ VIDEO_UPDATE( mutantf ) priority between sprites in each layer. Ie, if we didn't do this, then when two alpha blended shadows overlapped then they would be 25% transparent against the background, rather than 50% */ - if (priority & 1) + if (priority & 1) { bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); mutantf_draw_sprites(screen->machine, bitmap, cliprect, screen->machine->generic.buffered_spriteram.u16, 3); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); mutantf_draw_sprites(screen->machine, bitmap, cliprect, screen->machine->generic.buffered_spriteram2.u16, 4); - } - else + } + else { bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); mutantf_draw_sprites(screen->machine, bitmap, cliprect, screen->machine->generic.buffered_spriteram2.u16, 4); diff --git a/src/mame/video/dassault.c b/src/mame/video/dassault.c index 01373cb38ed..29e8f76a1fc 100644 --- a/src/mame/video/dassault.c +++ b/src/mame/video/dassault.c @@ -38,7 +38,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect } sprite = spritebase[offs + 1] & 0x7fff; - if (!sprite) + if (!sprite) continue; x = spritebase[offs + 2]; @@ -49,10 +49,10 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect y = spritebase[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; colour = (x >> 9) & 0x1f; - if (y & 0x8000) + if (y & 0x8000) colour += 32; fx = y & 0x2000; @@ -66,7 +66,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect x = 304 - x; y = 240 - y; - if (x > 320) + if (x > 320) continue; /* Speedup */ sprite &= ~multi; @@ -78,7 +78,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect inc = 1; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { y = 240 - y; x = 304 - x; @@ -89,65 +89,65 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect else mult = -16; /* Priority */ - switch (pf_priority & 3) + switch (pf_priority & 3) { case 0: - if (bank == 0) + if (bank == 0) { - switch (spritebase[offs+2]&0xc000) + switch (spritebase[offs+2]&0xc000) { case 0xc000: pmask = 1; break; case 0x8000: pmask = 8; break; case 0x4000: pmask = 32; break; case 0x0000: pmask = 128; break; } - } - else + } + else { - if (spritebase[offs + 2] & 0x8000) + if (spritebase[offs + 2] & 0x8000) pmask = 64; /* Check */ - else + else pmask = 64; } break; case 1: - if (bank == 0) + if (bank == 0) { - switch (spritebase[offs + 2] & 0xc000) + switch (spritebase[offs + 2] & 0xc000) { case 0xc000: pmask = 1; break; case 0x8000: pmask = 8; break; case 0x4000: pmask = 32; break; case 0x0000: pmask = 128; break; } - } - else + } + else { - if (spritebase[offs + 2] & 0x8000) + if (spritebase[offs + 2] & 0x8000) pmask = 16; /* Check */ - else + else pmask = 16; } break; case 2: /* Unused */ case 3: - if (bank == 0) + if (bank == 0) { - switch (spritebase[offs + 2] & 0xc000) + switch (spritebase[offs + 2] & 0xc000) { case 0xc000: pmask = 1; break; case 0x8000: pmask = 8; break; case 0x4000: pmask = 32; break; case 0x0000: pmask = 128; break; } - } - else + } + else { - if (spritebase[offs + 2] & 0x8000) + if (spritebase[offs + 2] & 0x8000) pmask = 64; /* Check */ - else + else pmask = 64; } break; @@ -190,22 +190,22 @@ VIDEO_UPDATE( dassault ) deco16ic_tilemap_4_draw(state->deco16ic, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); /* The middle playfields can be swapped priority-wise */ - if ((priority & 3) == 0) + if ((priority & 3) == 0) { deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 2); deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, 0, 16); - } - else if ((priority & 3) == 1) + } + else if ((priority & 3) == 1) { deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, 0, 2); deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 64); - } - else if ((priority & 3) == 3) + } + else if ((priority & 3) == 3) { deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, 0, 2); deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 16); - } - else + } + else { /* Unused */ } diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index 75ed023317d..14457c6f8db 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -153,14 +153,14 @@ Rowscroll style: void deco16ic_set_vram( const device_config *device, UINT8 *ram_bank ) { deco16ic_state *deco16ic = get_safe_token(device); - + deco16ic->vram = ram_bank; } UINT8 *deco16icvdp_get_vram( const device_config *device ) { deco16ic_state *deco16ic = get_safe_token(device); - + return deco16ic->vram; } #endif @@ -257,9 +257,9 @@ WRITE16_DEVICE_HANDLER( deco16ic_palette_dma_w ) const int m = device->machine->config->total_colors; int r, g, b, i; - for (i = 0; i < m; i++) + for (i = 0; i < m; i++) { - if (deco16ic->dirty_palette[i]) + if (deco16ic->dirty_palette[i]) { deco16ic->dirty_palette[i] = 0; @@ -308,14 +308,14 @@ static TILE_GET_INFO_DEVICE( get_pf4_tile_info ) UINT8 colour = (tile >> 12) & 0xf; UINT8 flags = 0; - if (tile & 0x8000) + if (tile & 0x8000) { - if ((deco16ic->pf34_control[6] >> 8) & 0x01) + if ((deco16ic->pf34_control[6] >> 8) & 0x01) { flags |= TILE_FLIPX; colour &= 0x7; } - if ((deco16ic->pf34_control[6] >> 8) & 0x02) + if ((deco16ic->pf34_control[6] >> 8) & 0x02) { flags|=TILE_FLIPY; colour &= 0x7; @@ -336,14 +336,14 @@ static TILE_GET_INFO_DEVICE( get_pf3_tile_info ) UINT8 colour = (tile >> 12) & 0xf; UINT8 flags = 0; - if (tile & 0x8000) + if (tile & 0x8000) { - if ((deco16ic->pf34_control[6] >> 0) & 0x01) + if ((deco16ic->pf34_control[6] >> 0) & 0x01) { flags |= TILE_FLIPX; colour &= 0x7; } - if ((deco16ic->pf34_control[6] >> 0) & 0x02) + if ((deco16ic->pf34_control[6] >> 0) & 0x02) { flags |= TILE_FLIPY; colour &= 0x7; @@ -364,14 +364,14 @@ static TILE_GET_INFO_DEVICE( get_pf2_tile_info ) UINT8 colour = (tile >> 12) & 0xf; UINT8 flags = 0; - if (tile & 0x8000) + if (tile & 0x8000) { - if ((deco16ic->pf12_control[6] >> 8) & 0x01) + if ((deco16ic->pf12_control[6] >> 8) & 0x01) { flags |= TILE_FLIPX; colour &= 0x7; } - if ((deco16ic->pf12_control[6] >> 8) & 0x02) + if ((deco16ic->pf12_control[6] >> 8) & 0x02) { flags |= TILE_FLIPY; colour &= 0x7; @@ -392,14 +392,14 @@ static TILE_GET_INFO_DEVICE( get_pf1_tile_info ) UINT8 colour = (tile >> 12) & 0xf; UINT8 flags = 0; - if (tile & 0x8000) + if (tile & 0x8000) { - if ((deco16ic->pf12_control[6] >> 0) & 0x01) + if ((deco16ic->pf12_control[6] >> 0) & 0x01) { flags |= TILE_FLIPX; colour &= 0x7; } - if ((deco16ic->pf12_control[6] >> 0) & 0x02) + if ((deco16ic->pf12_control[6] >> 0) & 0x02) { flags |= TILE_FLIPY; colour &= 0x7; @@ -420,14 +420,14 @@ static TILE_GET_INFO_DEVICE( get_pf2_tile_info_b ) UINT8 colour = (tile >> 12) & 0xf; UINT8 flags = 0; - if (tile & 0x8000) + if (tile & 0x8000) { - if ((deco16ic->pf12_control[6] >> 8) & 0x01) + if ((deco16ic->pf12_control[6] >> 8) & 0x01) { flags |= TILE_FLIPX; colour &= 0x7; } - if ((deco16ic->pf12_control[6] >> 8) & 0x02) + if ((deco16ic->pf12_control[6] >> 8) & 0x02) { flags |= TILE_FLIPY; colour &= 0x7; @@ -448,14 +448,14 @@ static TILE_GET_INFO_DEVICE( get_pf1_tile_info_b ) UINT8 colour = (tile >> 12) & 0xf; UINT8 flags = 0; - if (tile & 0x8000) + if (tile & 0x8000) { - if ((deco16ic->pf12_control[6] >> 0) & 0x01) + if ((deco16ic->pf12_control[6] >> 0) & 0x01) { flags |= TILE_FLIPX; colour &= 0x7; } - if ((deco16ic->pf12_control[6] >> 0) & 0x02) + if ((deco16ic->pf12_control[6] >> 0) & 0x02) { flags |= TILE_FLIPY; colour &= 0x7; @@ -518,7 +518,7 @@ static void custom_tilemap_draw( height_mask = src_bitmap0->height - 1; src_y = scrolly + 8; - for (y = 8; y < 248; y++) + for (y = 8; y < 248; y++) { if (rowscroll_ptr && BIT(control1, 6)) src_x = scrollx + rowscroll_ptr[src_y / row_type]; @@ -529,7 +529,7 @@ static void custom_tilemap_draw( if (bitmap->bpp == 16) { - for (x = 0; x < 320; x++) + for (x = 0; x < 320; x++) { if (rowscroll_ptr && BIT(control1, 5)) column_offset = rowscroll_ptr[0x200 + ((src_x & 0x1ff) / col_type)]; @@ -557,7 +557,7 @@ static void custom_tilemap_draw( else { /* boogwing */ - for (x = 0; x < 320; x++) + for (x = 0; x < 320; x++) { if (rowscroll_ptr && BIT(control1, 5)) column_offset = rowscroll_ptr[0x200 + ((src_x & 0x1ff) / col_type)]; @@ -593,7 +593,7 @@ void deco16ic_set_tilemap_colour_mask( running_device *device, int tmap, int mas { deco16ic_state *deco16ic = get_safe_token(device); - switch (tmap) + switch (tmap) { case 0: deco16ic->pf1_colourmask = mask; break; case 1: deco16ic->pf2_colourmask = mask; break; @@ -606,7 +606,7 @@ void deco16ic_pf34_set_gfxbank( running_device *device, int small, int big ) { deco16ic_state *deco16ic = get_safe_token(device); - if (deco16ic->pf34_last_big != big) + if (deco16ic->pf34_last_big != big) { if (deco16ic->pf3_tilemap_16x16) tilemap_mark_all_tiles_dirty(deco16ic->pf3_tilemap_16x16); @@ -623,26 +623,26 @@ void deco16ic_set_scrolldx( running_device *device, int tmap, int size, int dx, { deco16ic_state *deco16ic = get_safe_token(device); - switch (tmap) + switch (tmap) { - case 0: - if (!size) + case 0: + if (!size) tilemap_set_scrolldx(deco16ic->pf1_tilemap_16x16, dx, dx_if_flipped); else tilemap_set_scrolldx(deco16ic->pf1_tilemap_8x8, dx, dx_if_flipped); break; - case 1: - if (!size) + case 1: + if (!size) tilemap_set_scrolldx(deco16ic->pf2_tilemap_16x16, dx, dx_if_flipped); else tilemap_set_scrolldx(deco16ic->pf2_tilemap_8x8, dx, dx_if_flipped); break; - case 2: - if (!size) + case 2: + if (!size) tilemap_set_scrolldx(deco16ic->pf3_tilemap_16x16, dx, dx_if_flipped); break; - case 3: - if (!size) + case 3: + if (!size) tilemap_set_scrolldx(deco16ic->pf4_tilemap_16x16, dx, dx_if_flipped); break; } @@ -826,50 +826,50 @@ static int deco16_pf_update( int rows, cols, offs, use_custom = 0; /* Toggle between 8x8 and 16x16 modes (and master enable bit) */ - if (BIT(control1, 7)) + if (BIT(control1, 7)) { - if (!tilemap_8x8) + if (!tilemap_8x8) popmessage("Deco16: Playfield switched into 8x8 mode but no tilemap defined"); - if (tilemap_8x8) + if (tilemap_8x8) tilemap_set_enable(tilemap_8x8, BIT(control0, 7)); - if (tilemap_16x16) + if (tilemap_16x16) tilemap_set_enable(tilemap_16x16, 0); - } - else + } + else { - if (!tilemap_16x16) + if (!tilemap_16x16) popmessage("Deco16: Playfield switched into 16x16 mode but no tilemap defined"); - if (tilemap_8x8) + if (tilemap_8x8) tilemap_set_enable(tilemap_8x8, 0); - if (tilemap_16x16) + if (tilemap_16x16) tilemap_set_enable(tilemap_16x16, BIT(control0, 7)); } /* Rowscroll enable */ - if (rowscroll_ptr && (control1 & 0x60) == 0x40) + if (rowscroll_ptr && (control1 & 0x60) == 0x40) { /* Several different rowscroll styles */ - switch ((control0 >> 3) & 0xf) + switch ((control0 >> 3) & 0xf) { case 0: rows = 512; break;/* Every line of 512 height bitmap */ case 1: rows = 256; break; case 2: rows = 128; break; - case 3: rows = 64; break; - case 4: rows = 32; break; - case 5: rows = 16; break; - case 6: rows = 8; break; - case 7: rows = 4; break; - case 8: rows = 2; break; - default: rows = 1; break; + case 3: rows = 64; break; + case 4: rows = 32; break; + case 5: rows = 16; break; + case 6: rows = 8; break; + case 7: rows = 4; break; + case 8: rows = 2; break; + default: rows = 1; break; } - if (tilemap_16x16) + if (tilemap_16x16) { tilemap_set_scroll_cols(tilemap_16x16, 1); tilemap_set_scroll_rows(tilemap_16x16, rows); @@ -879,7 +879,7 @@ static int deco16_pf_update( tilemap_set_scrollx(tilemap_16x16, offs, scrollx + rowscroll_ptr[offs]); } - if (tilemap_8x8) + if (tilemap_8x8) { tilemap_set_scroll_cols(tilemap_8x8, 1); tilemap_set_scroll_rows(tilemap_8x8, rows / 2); @@ -894,16 +894,16 @@ static int deco16_pf_update( /* Column scroll ranges from 8 pixel columns to 512 pixel columns */ int mask = (0x40 >> (control0 & 7)) - 1; - if (mask == -1) + if (mask == -1) mask = 0; cols = (8 << (control0 & 7)) & 0x3ff; - if (!cols) + if (!cols) cols = 1024; cols = 1024 / cols; - if (tilemap_16x16) + if (tilemap_16x16) { tilemap_set_scroll_cols(tilemap_16x16, cols); tilemap_set_scroll_rows(tilemap_16x16, 1); @@ -913,7 +913,7 @@ static int deco16_pf_update( tilemap_set_scrolly(tilemap_16x16, offs, scrolly + rowscroll_ptr[(offs & mask) + 0x200]); } - if (tilemap_8x8) + if (tilemap_8x8) { cols = cols / 2; /* Adjust because 8x8 tilemap is half the width of 16x16 */ @@ -925,12 +925,12 @@ static int deco16_pf_update( tilemap_set_scrolly(tilemap_8x8, offs, scrolly + rowscroll_ptr[(offs & mask) + 0x200]); } } - else if (control1 & 0x60) + else if (control1 & 0x60) { /* Simultaneous row & column scroll requested - use custom renderer */ use_custom = 1; - if (tilemap_16x16) + if (tilemap_16x16) { tilemap_set_scroll_rows(tilemap_16x16, 1); tilemap_set_scroll_cols(tilemap_16x16, 1); @@ -938,7 +938,7 @@ static int deco16_pf_update( tilemap_set_scrolly(tilemap_16x16, 0, scrolly); } - if (tilemap_8x8) + if (tilemap_8x8) { tilemap_set_scroll_rows(tilemap_8x8, 1); tilemap_set_scroll_cols(tilemap_8x8, 1); @@ -947,10 +947,10 @@ static int deco16_pf_update( } - } - else + } + else { - if (tilemap_16x16) + if (tilemap_16x16) { tilemap_set_scroll_rows(tilemap_16x16, 1); tilemap_set_scroll_cols(tilemap_16x16, 1); @@ -958,7 +958,7 @@ static int deco16_pf_update( tilemap_set_scrolly(tilemap_16x16, 0, scrolly); } - if (tilemap_8x8) + if (tilemap_8x8) { tilemap_set_scroll_rows(tilemap_8x8, 1); tilemap_set_scroll_cols(tilemap_8x8, 1); @@ -982,30 +982,30 @@ void deco16ic_pf12_update( running_device *device, const UINT16 *rowscroll_1_ptr deco16ic->use_custom_pf1 = deco16_pf_update(deco16ic->pf1_tilemap_8x8, deco16ic->pf1_tilemap_16x16, rowscroll_1_ptr, deco16ic->pf12_control[1], deco16ic->pf12_control[2], deco16ic->pf12_control[5] & 0xff, deco16ic->pf12_control[6] & 0xff); /* Update banking and global flip state */ - if (deco16ic->bank_cb[0]) + if (deco16ic->bank_cb[0]) { bank1 = deco16ic->bank_cb[0](deco16ic->pf12_control[7] & 0xff); - if (bank1 != deco16ic->pf1_bank) + if (bank1 != deco16ic->pf1_bank) { - if (deco16ic->pf1_tilemap_8x8) + if (deco16ic->pf1_tilemap_8x8) tilemap_mark_all_tiles_dirty(deco16ic->pf1_tilemap_8x8); - if (deco16ic->pf1_tilemap_16x16) + if (deco16ic->pf1_tilemap_16x16) tilemap_mark_all_tiles_dirty(deco16ic->pf1_tilemap_16x16); deco16ic->pf1_bank = bank1; } } - if (deco16ic->bank_cb[1]) + if (deco16ic->bank_cb[1]) { bank2 = deco16ic->bank_cb[1](deco16ic->pf12_control[7] >> 8); - if (bank2 != deco16ic->pf2_bank) + if (bank2 != deco16ic->pf2_bank) { - if (deco16ic->pf2_tilemap_8x8) + if (deco16ic->pf2_tilemap_8x8) tilemap_mark_all_tiles_dirty(deco16ic->pf2_tilemap_8x8); - if (deco16ic->pf2_tilemap_16x16) + if (deco16ic->pf2_tilemap_16x16) tilemap_mark_all_tiles_dirty(deco16ic->pf2_tilemap_16x16); deco16ic->pf2_bank = bank2; @@ -1025,24 +1025,24 @@ void deco16ic_pf34_update( running_device *device, const UINT16 *rowscroll_1_ptr deco16ic->use_custom_pf3 = deco16_pf_update(0, deco16ic->pf3_tilemap_16x16, rowscroll_1_ptr, deco16ic->pf34_control[1], deco16ic->pf34_control[2], deco16ic->pf34_control[5] & 0xff, deco16ic->pf34_control[6] & 0xff); /* Update banking and global flip state */ - if (deco16ic->bank_cb[2]) + if (deco16ic->bank_cb[2]) { bank1 = deco16ic->bank_cb[2](deco16ic->pf34_control[7] & 0xff); - if (bank1 != deco16ic->pf3_bank) + if (bank1 != deco16ic->pf3_bank) { - if (deco16ic->pf3_tilemap_16x16) + if (deco16ic->pf3_tilemap_16x16) tilemap_mark_all_tiles_dirty(deco16ic->pf3_tilemap_16x16); deco16ic->pf3_bank = bank1; } } - if (deco16ic->bank_cb[3]) + if (deco16ic->bank_cb[3]) { bank2 = deco16ic->bank_cb[3](deco16ic->pf34_control[7] >> 8); - if (bank2 != deco16ic->pf4_bank) + if (bank2 != deco16ic->pf4_bank) { - if (deco16ic->pf4_tilemap_16x16) + if (deco16ic->pf4_tilemap_16x16) tilemap_mark_all_tiles_dirty(deco16ic->pf4_tilemap_16x16); deco16ic->pf4_bank = bank2; @@ -1060,7 +1060,7 @@ void deco16ic_print_debug_info(running_device *device, bitmap_t *bitmap) if (input_code_pressed(device->machine, KEYCODE_O)) return; - if (deco16ic->pf12_control) + if (deco16ic->pf12_control) { sprintf(buf,"%04X %04X %04X %04X\n", deco16ic->pf12_control[0], deco16ic->pf12_control[1], deco16ic->pf12_control[2], deco16ic->pf12_control[3]); sprintf(&buf[strlen(buf)],"%04X %04X %04X %04X\n", deco16ic->pf12_control[4], deco16ic->pf12_control[5], deco16ic->pf12_control[6], deco16ic->pf12_control[7]); @@ -1068,7 +1068,7 @@ void deco16ic_print_debug_info(running_device *device, bitmap_t *bitmap) else sprintf(buf, "\n\n"); - if (deco16ic->pf34_control) + if (deco16ic->pf34_control) { sprintf(&buf[strlen(buf)],"%04X %04X %04X %04X\n", deco16ic->pf34_control[0], deco16ic->pf34_control[1], deco16ic->pf34_control[2], deco16ic->pf34_control[3]); sprintf(&buf[strlen(buf)],"%04X %04X %04X %04X\n", deco16ic->pf34_control[4], deco16ic->pf34_control[5], deco16ic->pf34_control[6], deco16ic->pf34_control[7]); @@ -1131,7 +1131,7 @@ void deco16ic_pdrawgfx( if (sy >= 0 && sy < 248) { - if (flipx) { source += 15 - (sx - ox); x_index = -1; } + if (flipx) { source += 15 - (sx - ox); x_index = -1; } else { source += (sx - ox); x_index = 1; } for (x = sx; x < cx; x++) @@ -1139,7 +1139,7 @@ void deco16ic_pdrawgfx( int c = *source; if (c != transparent_color && x >= 0 && x < 320) { - if (pri_mask>pri[x] && sprite_mask>spri[x]) + if (pri_mask>pri[x] && sprite_mask>spri[x]) { if (alpha != 0xff) destb[x] = alpha_blend_r32(destb[x], pal[c], alpha); @@ -1173,9 +1173,9 @@ void deco16ic_tilemap_1_draw( running_device *device, bitmap_t *bitmap, const re } else { - if (deco16ic->pf1_tilemap_8x8) + if (deco16ic->pf1_tilemap_8x8) tilemap_draw(bitmap, cliprect, deco16ic->pf1_tilemap_8x8, flags, priority); - if (deco16ic->pf1_tilemap_16x16) + if (deco16ic->pf1_tilemap_16x16) tilemap_draw(bitmap, cliprect, deco16ic->pf1_tilemap_16x16, flags, priority); } } @@ -1190,9 +1190,9 @@ void deco16ic_tilemap_2_draw(running_device *device, bitmap_t *bitmap, const rec } else { - if (deco16ic->pf2_tilemap_8x8) + if (deco16ic->pf2_tilemap_8x8) tilemap_draw(bitmap, cliprect, deco16ic->pf2_tilemap_8x8, flags, priority); - if (deco16ic->pf2_tilemap_16x16) + if (deco16ic->pf2_tilemap_16x16) tilemap_draw(bitmap, cliprect, deco16ic->pf2_tilemap_16x16, flags, priority); } } @@ -1201,9 +1201,9 @@ void deco16ic_tilemap_3_draw(running_device *device, bitmap_t *bitmap, const rec { deco16ic_state *deco16ic = get_safe_token(device); - if (deco16ic->use_custom_pf3) + if (deco16ic->use_custom_pf3) custom_tilemap_draw(device, bitmap, 0, deco16ic->pf3_tilemap_16x16, 0, 0, deco16ic->pf3_rowscroll_ptr, deco16ic->pf34_control[1], deco16ic->pf34_control[2], deco16ic->pf34_control[5] & 0xff, deco16ic->pf34_control[6] & 0xff, 0, 0, deco16ic->pf3_trans_mask, flags, priority); - else if (deco16ic->pf3_tilemap_16x16) + else if (deco16ic->pf3_tilemap_16x16) tilemap_draw(bitmap, cliprect, deco16ic->pf3_tilemap_16x16, flags, priority); } @@ -1211,9 +1211,9 @@ void deco16ic_tilemap_4_draw(running_device *device, bitmap_t *bitmap, const rec { deco16ic_state *deco16ic = get_safe_token(device); - if (deco16ic->use_custom_pf4) + if (deco16ic->use_custom_pf4) custom_tilemap_draw(device, bitmap, 0, deco16ic->pf4_tilemap_16x16, 0, 0, deco16ic->pf4_rowscroll_ptr, deco16ic->pf34_control[3], deco16ic->pf34_control[4], deco16ic->pf34_control[5] >> 8, deco16ic->pf34_control[6] >> 8, 0, 0, deco16ic->pf4_trans_mask, flags, priority); - else if (deco16ic->pf4_tilemap_16x16) + else if (deco16ic->pf4_tilemap_16x16) tilemap_draw(bitmap, cliprect, deco16ic->pf4_tilemap_16x16, flags, priority); } diff --git a/src/mame/video/dietgo.c b/src/mame/video/dietgo.c index b57a4a3ea66..c9b82d4f6d3 100644 --- a/src/mame/video/dietgo.c +++ b/src/mame/video/dietgo.c @@ -14,12 +14,12 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = spriteram[offs + 1]; - if (!sprite) + if (!sprite) continue; y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2]; @@ -36,7 +36,7 @@ static void draw_sprites( running_machine* machine, bitmap_t *bitmap, const rect y = 240 - y; x = 304 - x; - if (x > 320) + if (x > 320) continue; sprite &= ~multi; diff --git a/src/mame/video/funkyjet.c b/src/mame/video/funkyjet.c index 29aa1ec1bc9..a67a8915f84 100644 --- a/src/mame/video/funkyjet.c +++ b/src/mame/video/funkyjet.c @@ -24,7 +24,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2]; @@ -41,7 +41,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = 240 - y; x = 304 - x; - if (x > 320) + if (x > 320) continue; sprite &= ~multi; diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index 5650b69831a..3820c354888 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -2110,7 +2110,7 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct // Debug - Colors polygons with certain flags bright blue! ajg polys[*numPolys].debugColor = 0; //polys[*numPolys].debugColor = tdColor; - + // Debug - ajg //printf("%d (%08x) : %04x %04x %04x\n", k, address[k]*3*2, chunkOffset[0], chunkOffset[1], chunkOffset[2]); //break; @@ -2363,7 +2363,7 @@ void recoverPolygonBlock(running_machine* machine, const UINT16* packet, struct vecmatmul4(transformedNormal, objectMatrix, polys[*numPolys].vert[v].normal); normalize(transformedNormal); normalize(lightVector); - + float intensity = vecDotProduct(transformedNormal, lightVector) * -1.0f; intensity = (intensity <= 0.0f) ? (0.0f) : (intensity); intensity *= lightStrength * 128.0f * 0.5f; // HACK. This 0.5 is completely arbitrary. diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 089ce97496d..a7c94cadb17 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -60,9 +60,9 @@ static TILE_GET_INFO( get_back_tile_info ) } tile = RAM[tile_index]; - if (tile > 0x7f) - bank = 3; - else + if (tile > 0x7f) + bank = 3; + else bank = 2; SET_TILE_INFO(bank, tile & 0x7f, state->background_color, 0); } @@ -323,7 +323,7 @@ static void liberate_draw_sprites( running_machine *machine, bitmap_t *bitmap, c fy = spriteram[offs + 0] & 0x02; multi = spriteram[offs + 0] & 0x10; - if (multi && fy == 0) + if (multi && fy == 0) sy -= 16; if (flip_screen_get(machine)) @@ -367,7 +367,7 @@ static void prosport_draw_sprites( running_machine *machine, bitmap_t *bitmap, c for (offs = 0x000; offs < 0x800; offs += 4) { - if ((spriteram[offs + 0] & 1) != 1) + if ((spriteram[offs + 0] & 1) != 1) continue; code = spriteram[offs + 1] + ((spriteram[offs + 0] & 0x3) << 8); @@ -382,7 +382,7 @@ static void prosport_draw_sprites( running_machine *machine, bitmap_t *bitmap, c multi = spriteram[offs + 0] & 0x10; sy = spriteram[offs + 2]; - if (multi) + if (multi) sy += 16; sx = (240 - spriteram[offs + 3]); // sy = (240 - spriteram[offs + 2]);//-16; @@ -432,9 +432,9 @@ static void boomrang_draw_sprites( running_machine *machine, bitmap_t *bitmap, c for (offs = 0x000; offs < 0x800; offs += 4) { - if ((spriteram[offs + 0] & 1) != 1) + if ((spriteram[offs + 0] & 1) != 1) continue; - if ((spriteram[offs + 0] & 0x8) != pri) + if ((spriteram[offs + 0] & 0x8) != pri) continue; code = spriteram[offs + 1] + ((spriteram[offs + 0] & 0xe0) << 3); @@ -443,7 +443,7 @@ static void boomrang_draw_sprites( running_machine *machine, bitmap_t *bitmap, c multi = spriteram[offs + 0] & 0x10; sy=spriteram[offs + 2]; - if (multi) + if (multi) sy += 16; sx = (240 - spriteram[offs + 3]); // sy = (240-spriteram[offs + 2]);//-16; @@ -493,7 +493,7 @@ static void prosoccr_draw_sprites( running_machine *machine, bitmap_t *bitmap, c for (offs = 0x000; offs < 0x400; offs += 4) { - if ((spriteram[offs + 0] & 1) != 1) + if ((spriteram[offs + 0] & 1) != 1) continue; code = spriteram[offs + 1]; diff --git a/src/mame/video/lsasquad.c b/src/mame/video/lsasquad.c index 523886ffaad..0f9652c8820 100644 --- a/src/mame/video/lsasquad.c +++ b/src/mame/video/lsasquad.c @@ -15,7 +15,7 @@ static void draw_layer( running_machine *machine, bitmap_t *bitmap, const rectan base = 64 * scrollram[offs + 1]; sx = 8 * (offs / 4) + scrollx; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) sx = 248 - sx; sx &= 0xff; @@ -25,7 +25,7 @@ static void draw_layer( running_machine *machine, bitmap_t *bitmap, const rectan int attr; sy = 8 * y + scrolly; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) sy = 248 - sy; sy &= 0xff; @@ -102,7 +102,7 @@ static int draw_layer_daikaiju( running_machine *machine, bitmap_t *bitmap, cons base = 64 * state->scrollram[offs + 1]; sx = scrollx + stepx; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) sx = 248 - sx; sx &= 0xff; @@ -111,7 +111,7 @@ static int draw_layer_daikaiju( running_machine *machine, bitmap_t *bitmap, cons int attr; sy = 8 * y + scrolly; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) sy = 248 - sy; sy &= 0xff; diff --git a/src/mame/video/macrossp.c b/src/mame/video/macrossp.c index cb71113a0c9..6d8b06619c2 100644 --- a/src/mame/video/macrossp.c +++ b/src/mame/video/macrossp.c @@ -240,16 +240,16 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta if (xpos > 0x1ff) xpos -=0x400; if (ypos > 0x1ff) ypos -=0x400; - if (!flipx) + if (!flipx) { - if (!flipy) - { + if (!flipy) + { /* noxflip, noyflip */ yoffset = 0; /* I'm doing this so rounding errors are cumulative, still looks a touch crappy when multiple sprites used together */ - for (ycnt = 0; ycnt <= high; ycnt++) + for (ycnt = 0; ycnt <= high; ycnt++) { xoffset = 0; - for (xcnt = 0; xcnt <= wide; xcnt++) + for (xcnt = 0; xcnt <= wide; xcnt++) { drawgfxzoom_alpha(bitmap,cliprect,gfx,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); @@ -260,13 +260,13 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } else - { + { /* noxflip, flipy */ yoffset = ((high * yzoom * 16) >> 8); - for (ycnt = high; ycnt >= 0; ycnt--) + for (ycnt = high; ycnt >= 0; ycnt--) { xoffset = 0; - for (xcnt = 0; xcnt <= wide; xcnt++) + for (xcnt = 0; xcnt <= wide; xcnt++) { drawgfxzoom_alpha(bitmap,cliprect,gfx,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); @@ -279,14 +279,14 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } else { - if (!flipy) - { + if (!flipy) + { /* xflip, noyflip */ yoffset = 0; - for (ycnt = 0; ycnt <= high; ycnt++) + for (ycnt = 0; ycnt <= high; ycnt++) { xoffset = ((wide*xzoom*16) >> 8); - for (xcnt = wide; xcnt >= 0; xcnt--) + for (xcnt = wide; xcnt >= 0; xcnt--) { drawgfxzoom_alpha(bitmap,cliprect,gfx,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); @@ -297,13 +297,13 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } else - { + { /* xflip, yflip */ yoffset = ((high * yzoom * 16) >> 8); - for (ycnt = high; ycnt >= 0; ycnt--) + for (ycnt = high; ycnt >= 0; ycnt--) { xoffset = ((wide * xzoom * 16) >> 8); - for (xcnt = wide; xcnt >=0 ; xcnt--) + for (xcnt = wide; xcnt >=0 ; xcnt--) { drawgfxzoom_alpha(bitmap,cliprect,gfx,tileno+loopno,col,flipx,flipy,xpos+xoffset,ypos+yoffset,xzoom*0x100,yzoom*0x100,0,alpha); diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index 0860f65354a..4a6236512ed 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -188,7 +188,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect incy = 1; } - if (state->flipscreen) + if (state->flipscreen) { sy = 240 - sy; sx = 240 - sx; @@ -196,7 +196,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect if (flipy) flipy = 0; else flipy = 1; mult = 16; } - else + else mult = -16; for (x = 0; x < w; x++) diff --git a/src/mame/video/mcatadv.c b/src/mame/video/mcatadv.c index 08e373c592c..062ccdb15ba 100644 --- a/src/mame/video/mcatadv.c +++ b/src/mame/video/mcatadv.c @@ -117,26 +117,26 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect if(!flipy) { ystart = 0; yend = height; yinc = 1; } else { ystart = height-1; yend = -1; yinc = -1; } - for (ycnt = ystart; ycnt != yend; ycnt += yinc) + for (ycnt = ystart; ycnt != yend; ycnt += yinc) { drawypos = y + ycnt - global_y; - if ((drawypos >= cliprect->min_y) && (drawypos <= cliprect->max_y)) + if ((drawypos >= cliprect->min_y) && (drawypos <= cliprect->max_y)) { destline = BITMAP_ADDR16(bitmap, drawypos, 0); priline = BITMAP_ADDR8(machine->priority_bitmap, drawypos, 0); - for (xcnt = xstart; xcnt != xend; xcnt += xinc) + for (xcnt = xstart; xcnt != xend; xcnt += xinc) { drawxpos = x + xcnt - global_x; - if((priline[drawxpos] < pri)) + if((priline[drawxpos] < pri)) { - if (offset >= 0x500000 * 2) + if (offset >= 0x500000 * 2) offset = 0; pix = sprdata[offset / 2]; - if (offset & 1) + if (offset & 1) pix = pix >> 4; pix &= 0x0f; @@ -146,7 +146,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect offset++; } } - else + else { offset += width; } @@ -208,13 +208,13 @@ VIDEO_UPDATE( mcatadv ) bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); bitmap_fill(screen->machine->priority_bitmap, cliprect, 0); - if (state->scroll1[2] != state->palette_bank1) + if (state->scroll1[2] != state->palette_bank1) { state->palette_bank1 = state->scroll1[2]; tilemap_mark_all_tiles_dirty(state->tilemap1); } - if (state->scroll2[2] != state->palette_bank2) + if (state->scroll2[2] != state->palette_bank2) { state->palette_bank2 = state->scroll2[2]; tilemap_mark_all_tiles_dirty(state->tilemap2); diff --git a/src/mame/video/metlclsh.c b/src/mame/video/metlclsh.c index 10e32e94e9b..16881404e8a 100644 --- a/src/mame/video/metlclsh.c +++ b/src/mame/video/metlclsh.c @@ -174,7 +174,7 @@ VIDEO_START( metlclsh ) ***************************************************************************/ -static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) +static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ) { metlclsh_state *state = (metlclsh_state *)machine->driver_data; UINT8 *spriteram = state->spriteram; @@ -196,7 +196,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect code = ((attr & 0x60) << 3) + spriteram[offs + 1]; sx = 240 - spriteram[offs + 3]; - if (sx < -7) + if (sx < -7) sx += 256; sy = 240 - spriteram[offs + 2]; diff --git a/src/mame/video/mexico86.c b/src/mame/video/mexico86.c index 93680cf68e4..7b04fb681f7 100644 --- a/src/mame/video/mexico86.c +++ b/src/mame/video/mexico86.c @@ -36,10 +36,10 @@ VIDEO_UPDATE( mexico86 ) { int height; - if (offs >= state->objectram_size && offs < state->objectram_size + 0x180) + if (offs >= state->objectram_size && offs < state->objectram_size + 0x180) continue; - if (offs >= state->objectram_size + 0x1c0) + if (offs >= state->objectram_size + 0x1c0) continue; /* skip empty sprites */ @@ -113,7 +113,7 @@ VIDEO_UPDATE( kikikai ) sx = 0; for (offs = 0; offs < state->objectram_size; offs += 4) { - if (*(UINT32*)(state->objectram + offs) == 0) + if (*(UINT32*)(state->objectram + offs) == 0) continue; ty = state->objectram[offs]; diff --git a/src/mame/video/mrdo.c b/src/mame/video/mrdo.c index 5f542ea36c3..717201c39cb 100644 --- a/src/mame/video/mrdo.c +++ b/src/mame/video/mrdo.c @@ -216,9 +216,9 @@ WRITE8_HANDLER( mrdo_scrolly_w ) mrdo_state *state = (mrdo_state *)space->machine->driver_data; /* This is NOT affected by flipscreen (so stop it happening) */ - if (state->flipscreen) + if (state->flipscreen) tilemap_set_scrolly(state->bg_tilemap, 0,((256 - data) & 0xff)); - else + else tilemap_set_scrolly(state->bg_tilemap, 0, data); } diff --git a/src/mame/video/mrflea.c b/src/mame/video/mrflea.c index 5900d5cbea4..7f6c3607409 100644 --- a/src/mame/video/mrflea.c +++ b/src/mame/video/mrflea.c @@ -34,7 +34,7 @@ WRITE8_HANDLER( mrflea_spriteram_w ) mrflea_state *state = (mrflea_state *)space->machine->driver_data; if (offset & 2) - { + { /* tile_number */ state->spriteram[offset | 1] = offset & 1; offset &= ~1; @@ -85,7 +85,7 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r if (BIT(state->gfx_bank, 2)) base |= 0x400; - if (BIT(state->gfx_bank, 4)) + if (BIT(state->gfx_bank, 4)) base |= 0x200; for (sy = 0; sy < 256; sy += 8) diff --git a/src/mame/video/nemesis.c b/src/mame/video/nemesis.c index a795fd99c7b..6ace2f9f97e 100644 --- a/src/mame/video/nemesis.c +++ b/src/mame/video/nemesis.c @@ -30,20 +30,20 @@ static TILE_GET_INFO( get_bg_tile_info ) color = state->colorram2[tile_index]; flags = 0; - if (color & 0x80) + if (color & 0x80) flags |= TILE_FLIPX; - if (code & 0x0800) + if (code & 0x0800) flags |= TILE_FLIPY; if ((~code & 0x2000) || ((code & 0xc000) == 0x4000)) flags |= TILE_FORCE_LAYER0; /* no transparency */ - if (code & 0xf800) + if (code & 0xf800) { SET_TILE_INFO( 0, code & 0x7ff, color & 0x7f, flags ); - } - else + } + else { SET_TILE_INFO( 0, 0, 0x00, 0 ); tileinfo->pen_data = state->blank_tile; @@ -66,20 +66,20 @@ static TILE_GET_INFO( get_fg_tile_info ) color = state->colorram1[tile_index]; flags = 0; - if (color & 0x80) + if (color & 0x80) flags |= TILE_FLIPX; - if (code & 0x0800) + if (code & 0x0800) flags |= TILE_FLIPY; if ((~code & 0x2000) || ((code & 0xc000) == 0x4000)) flags |= TILE_FORCE_LAYER0; /* no transparency */ - if (code & 0xf800) + if (code & 0xf800) { SET_TILE_INFO( 0, code & 0x7ff, color & 0x7f, flags ); - } - else + } + else { SET_TILE_INFO( 0, 0, 0x00, 0 ); tileinfo->pen_data = state->blank_tile; @@ -373,7 +373,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect { for (adress = state->spriteram_words - 8; adress >= 0; adress -= 8) { - if((spriteram[adress] & 0xff) != priority) + if((spriteram[adress] & 0xff) != priority) continue; zoom = spriteram[adress + 2] & 0xff; diff --git a/src/mame/video/news.c b/src/mame/video/news.c index dac74eddba2..5df3e1b4b0b 100644 --- a/src/mame/video/news.c +++ b/src/mame/video/news.c @@ -26,7 +26,7 @@ static TILE_GET_INFO( get_bg_tile_info ) int color = (code & 0xf000) >> 12; code &= 0x0fff; - if ((code & 0x0e00) == 0x0e00) + if ((code & 0x0e00) == 0x0e00) code = (code & 0x1ff) | (state->bgpic << 9); SET_TILE_INFO( diff --git a/src/mame/video/nycaptor.c b/src/mame/video/nycaptor.c index ac6082986e4..d06cc9e0874 100644 --- a/src/mame/video/nycaptor.c +++ b/src/mame/video/nycaptor.c @@ -64,7 +64,7 @@ static TILE_GET_INFO( get_tile_info ) { if (nycaptor_spot(machine)) pal = 0xe; - else + else pal = 4; } #endif @@ -237,7 +237,7 @@ static void nycaptor_setmask( running_machine *machine ) mKEY_MASK(KEYCODE_Q, 1); /* bg */ mKEY_MASK(KEYCODE_W, 2); - mKEY_MASK(KEYCODE_E, 4); + mKEY_MASK(KEYCODE_E, 4); mKEY_MASK(KEYCODE_R, 8); mKEY_MASK(KEYCODE_A, 0x10); /* sprites */ diff --git a/src/mame/video/ohmygod.c b/src/mame/video/ohmygod.c index 343c03957d5..1d3052f5844 100644 --- a/src/mame/video/ohmygod.c +++ b/src/mame/video/ohmygod.c @@ -93,7 +93,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect color = sr[offs + 2] & 0x000f; sx = sr[offs + 0] - 29; sy = sr[offs + 1]; - if (sy >= 32768) + if (sy >= 32768) sy -= 65536; flipx = sr[offs + 3] & 0x8000; diff --git a/src/mame/video/ojankohs.c b/src/mame/video/ojankohs.c index 455312aac02..815b7f747e0 100644 --- a/src/mame/video/ojankohs.c +++ b/src/mame/video/ojankohs.c @@ -22,7 +22,7 @@ PALETTE_INIT( ojankoy ) int i; int bit0, bit1, bit2, bit3, bit4, r, g, b; - for (i = 0; i < machine->config->total_colors; i++) + for (i = 0; i < machine->config->total_colors; i++) { bit0 = BIT(color_prom[0], 2); bit1 = BIT(color_prom[0], 3); @@ -88,7 +88,7 @@ WRITE8_HANDLER( ojankoc_palette_w ) ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; int r, g, b, color; - if (state->paletteram[offset] == data) + if (state->paletteram[offset] == data) return; state->paletteram[offset] = data; @@ -128,7 +128,7 @@ WRITE8_HANDLER( ojankohs_gfxreg_w ) { ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; - if (state->gfxreg != data) + if (state->gfxreg != data) { state->gfxreg = data; tilemap_mark_all_tiles_dirty(state->tilemap); @@ -139,19 +139,19 @@ WRITE8_HANDLER( ojankohs_flipscreen_w ) { ojankohs_state *state = (ojankohs_state *)space->machine->driver_data; - if (state->flipscreen != BIT(data, 0)) + if (state->flipscreen != BIT(data, 0)) { state->flipscreen = BIT(data, 0); tilemap_set_flip_all(space->machine, state->flipscreen ? (TILEMAP_FLIPX | TILEMAP_FLIPY) : 0); - if (state->flipscreen) + if (state->flipscreen) { state->scrollx = -0xe0; state->scrolly = -0x20; } - else + else { state->scrollx = 0; state->scrolly = 0; @@ -165,7 +165,7 @@ static TILE_GET_INFO( ojankohs_get_tile_info ) int tile = state->videoram[tile_index] | ((state->colorram[tile_index] & 0x0f) << 8); int color = (state->colorram[tile_index] & 0xe0) >> 5; - if (state->colorram[tile_index] & 0x10) + if (state->colorram[tile_index] & 0x10) { tile |= (state->gfxreg & 0x07) << 12; color |= (state->gfxreg & 0xe0) >> 2; @@ -200,12 +200,12 @@ void ojankoc_flipscreen( const address_space *space, int data ) state->flipscreen = BIT(data, 7); - if (state->flipscreen == state->flipscreen_old) + if (state->flipscreen == state->flipscreen_old) return; - for (y = 0; y < 0x40; y++) + for (y = 0; y < 0x40; y++) { - for (x = 0; x < 0x100; x++) + for (x = 0; x < 0x100; x++) { color1 = state->videoram[0x0000 + ((y * 256) + x)]; color2 = state->videoram[0x3fff - ((y * 256) + x)]; @@ -238,14 +238,14 @@ WRITE8_HANDLER( ojankoc_videoram_w ) x = (offset & 0x3f) << 2; xx = 0; - if (state->flipscreen) + if (state->flipscreen) { x = 0xfc - x; y = 0xff - y; xx = 3; } - for (i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { color = ((color1 & 0x01) >> 0) | ((color1 & 0x10) >> 3) | ((color2 & 0x01) << 2) | ((color2 & 0x10) >> 1); @@ -335,7 +335,7 @@ VIDEO_UPDATE( ojankoc ) const address_space *space = cputag_get_address_space(screen->machine, "maincpu", ADDRESS_SPACE_PROGRAM); /* redraw bitmap */ - for (offs = 0; offs < 0x8000; offs++) + for (offs = 0; offs < 0x8000; offs++) { ojankoc_videoram_w(space, offs, state->videoram[offs]); } diff --git a/src/mame/video/oneshot.c b/src/mame/video/oneshot.c index 04717f6b21f..e3a84da1e00 100644 --- a/src/mame/video/oneshot.c +++ b/src/mame/video/oneshot.c @@ -122,15 +122,15 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect xpos = xpos >> 7; - if (source[0] == 0x0001) + if (source[0] == 0x0001) break; xpos -= 8; ypos -= 6; - for (blockx = 0; blockx < xsize; blockx++) + for (blockx = 0; blockx < xsize; blockx++) { - for (blocky = 0; blocky < ysize; blocky++) + for (blocky = 0; blocky < ysize; blocky++) { drawgfx_transpen( bitmap, diff --git a/src/mame/video/othldrby.c b/src/mame/video/othldrby.c index 9857694c0a0..64bc2e55bff 100644 --- a/src/mame/video/othldrby.c +++ b/src/mame/video/othldrby.c @@ -146,7 +146,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int x, y, color, code, sx, sy, flipx, flipy, sizex, sizey, pri; pri = (state->buf_spriteram[offs] & 0x0600) >> 9; - if (pri != priority) + if (pri != priority) continue; flipx = state->buf_spriteram[offs] & 0x1000; @@ -229,6 +229,6 @@ VIDEO_EOF( othldrby ) othldrby_state *state = (othldrby_state *)machine->driver_data; /* sprites need to be delayed two frames */ - memcpy(state->buf_spriteram, state->buf_spriteram2, SPRITERAM_SIZE * sizeof(state->buf_spriteram[0])); + memcpy(state->buf_spriteram, state->buf_spriteram2, SPRITERAM_SIZE * sizeof(state->buf_spriteram[0])); memcpy(state->buf_spriteram2, &state->vram[SPRITERAM_START], SPRITERAM_SIZE * sizeof(state->buf_spriteram[0])); } diff --git a/src/mame/video/pktgaldx.c b/src/mame/video/pktgaldx.c index c15d0ae9c10..8e6b0311aac 100644 --- a/src/mame/video/pktgaldx.c +++ b/src/mame/video/pktgaldx.c @@ -14,12 +14,12 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = spriteram[offs+1]; - if (!sprite) + if (!sprite) continue; y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2]; @@ -36,7 +36,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta y = 240 - y; x = 304 - x; - if (x > 320) + if (x > 320) continue; sprite &= ~multi; diff --git a/src/mame/video/rohga.c b/src/mame/video/rohga.c index 062f16161d2..f289ee9e781 100644 --- a/src/mame/video/rohga.c +++ b/src/mame/video/rohga.c @@ -35,13 +35,13 @@ static void rohga_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons { int x, y, sprite, colour, multi, fx, fy, inc, flash, mult, pri = 0; sprite = spriteptr[offs + 1]; - if (!sprite) + if (!sprite) continue; x = spriteptr[offs + 2]; /* Sprite/playfield priority */ - switch (x & 0x6000) + switch (x & 0x6000) { case 0x0000: pri = 0; break; case 0x4000: pri = 0xf0; break; @@ -51,7 +51,7 @@ static void rohga_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons y = spriteptr[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; // Sprite colour is different between Rohga (6bpp) and Schmeisr (4bpp plus wire mods on pcb) @@ -84,7 +84,7 @@ static void rohga_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons inc = 1; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { x = 304 - x; y = 240 - y; @@ -92,7 +92,7 @@ static void rohga_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons if (fy) fy = 0; else fy = 1; mult = -16; } - else + else mult = +16; while (multi >= 0) @@ -119,7 +119,7 @@ static void wizdfire_draw_sprites( running_machine *machine, bitmap_t *bitmap, c int alpha = 0xff; sprite = spriteptr[offs + 1]; - if (!sprite) + if (!sprite) continue; x = spriteptr[offs + 2]; @@ -131,7 +131,7 @@ static void wizdfire_draw_sprites( running_machine *machine, bitmap_t *bitmap, c Hence, we rely on the hardware sorting everything correctly and not relying on any orthoganality effects (it doesn't seem to), and instead draw seperate passes for each sprite priority. :( */ - switch (mode) + switch (mode) { case 4: if ((x & 0xc000) != 0xc000) @@ -155,11 +155,11 @@ static void wizdfire_draw_sprites( running_machine *machine, bitmap_t *bitmap, c y = spriteptr[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; colour = (x >> 9) & 0x1f; - if (bank == 4 && colour & 0x10) + if (bank == 4 && colour & 0x10) { alpha = 0x80; colour &= 0xf; @@ -183,7 +183,7 @@ static void wizdfire_draw_sprites( running_machine *machine, bitmap_t *bitmap, c inc = 1; } - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) { x = 304 - x; y = 240 - y; @@ -256,7 +256,7 @@ Sprites 2: int alpha = 0xff; sprite = spriteptr[offs + 3]; - if (!sprite) + if (!sprite) { offs += inc; continue; @@ -268,7 +268,7 @@ Sprites 2: w = (spriteptr[offs + 2] & 0x0f00) >> 8; sy = spriteptr[offs]; - if ((sy & 0x2000) && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if ((sy & 0x2000) && (video_screen_get_frame_number(machine->primary_screen) & 1)) { offs += inc; continue; @@ -277,10 +277,10 @@ Sprites 2: colour = (spriteptr[offs + 2] >> 0) & 0x1f; // PRIORITIES - TODO - if (gfxbank == 3) + if (gfxbank == 3) { /* Sprite chip 1 */ - switch (spriteptr[offs + 2] & 0xe0) + switch (spriteptr[offs + 2] & 0xe0) { // case 0xc0: colour = rand()%0xff; tilemap_pri = 256; break; //todo case 0xc0: tilemap_pri = 8; break; //? under other sprites @@ -343,8 +343,8 @@ sprite 2: */ sprite_pri = 1; - } - else + } + else { /* Sprite chip 2 (with alpha blending) */ @@ -362,7 +362,7 @@ sprite 2: sprite_pri = 2; } - if (gfxbank == 4 && colour & 0x10) + if (gfxbank == 4 && colour & 0x10) { alpha = 0x80; colour &= 0xf; @@ -371,7 +371,7 @@ sprite 2: fx = (spriteptr[offs + 0] & 0x4000); fy = (spriteptr[offs + 0] & 0x8000); - if (!flip_screen_get(machine)) + if (!flip_screen_get(machine)) { /* Inverted from Mutant Fighter! */ if (fx) fx = 0; else fx = 1; if (fy) fy = 0; else fy = 1; @@ -383,8 +383,8 @@ sprite 2: if (fx) { x_mult = -16; sx += 16 * w; } else { x_mult = 16; sx -= 16; } if (fy) { y_mult = -16; sy += 16 * h; } else { y_mult = 16; sy -= 16; } - } - else + } + else { sx = sx & 0x01ff; sy = sy & 0x01ff; @@ -398,9 +398,9 @@ sprite 2: if (fy) { y_mult = -16; sy += 16; } else { y_mult = 16; sy -= 16 * h; } } - for (x = 0; x < w; x++) + for (x = 0; x < w; x++) { - for (y = 0; y < h; y++) + for (y = 0; y < h; y++) { deco16ic_pdrawgfx( state->deco16ic, diff --git a/src/mame/video/simpl156.c b/src/mame/video/simpl156.c index 0ebd92a5372..578c705be7b 100644 --- a/src/mame/video/simpl156.c +++ b/src/mame/video/simpl156.c @@ -52,7 +52,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta y = spriteram[offs] & 0xffff; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2] & 0xffff; @@ -60,7 +60,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta pri = (x & 0xc000); // 2 bits or 1? - switch (pri & 0xc000) + switch (pri & 0xc000) { case 0x0000: pri = 0; break; case 0x4000: pri = 0xf0; break; @@ -79,7 +79,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta y = 240 - y; x = 304 - x; - if (x > 320) + if (x > 320) continue; sprite &= ~multi; @@ -99,7 +99,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta if (fy) fy = 0; else fy = 1; mult = 16; } - else + else mult = -16; while (multi >= 0) diff --git a/src/mame/video/snes.c b/src/mame/video/snes.c index feec78d0c38..393cf223a76 100644 --- a/src/mame/video/snes.c +++ b/src/mame/video/snes.c @@ -520,14 +520,14 @@ INLINE void snes_update_line( UINT8 screen, UINT8 color_depth, UINT8 hires, UINT // tmap %= 0x10000; /* - Tilemap format - vhopppcc cccccccc + Tilemap format + vhopppcc cccccccc - v/h = Vertical/Horizontal flip this tile. - o = Tile priority. - ppp = Tile palette. The number of entries in the palette depends on the Mode and the BG. - cccccccccc = Tile number. - */ + v/h = Vertical/Horizontal flip this tile. + o = Tile priority. + ppp = Tile palette. The number of entries in the palette depends on the Mode and the BG. + cccccccccc = Tile number. + */ UINT16 tilemap = snes_vram[tmap + ii] | (snes_vram[tmap + ii + 1] << 8); vflip = BIT(tilemap, 15); hflip = BIT(tilemap, 14); diff --git a/src/mame/video/supbtime.c b/src/mame/video/supbtime.c index da880a2993a..67c6512b3de 100644 --- a/src/mame/video/supbtime.c +++ b/src/mame/video/supbtime.c @@ -29,12 +29,12 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = spriteram[offs + 1] & 0x3fff; - if (!sprite) + if (!sprite) continue; y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2]; @@ -51,7 +51,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = 240 - y; x = 304 - x; - if (x > 320) + if (x > 320) continue; sprite &= ~multi; diff --git a/src/mame/video/tumbleb.c b/src/mame/video/tumbleb.c index 43ebb72bea3..876764971ac 100644 --- a/src/mame/video/tumbleb.c +++ b/src/mame/video/tumbleb.c @@ -30,12 +30,12 @@ static void tumblepb_draw_sprites( running_machine *machine, bitmap_t *bitmap, c int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = spriteram[offs + 1] & 0x3fff; - if (!sprite) + if (!sprite) continue; y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2]; @@ -69,7 +69,7 @@ static void tumblepb_draw_sprites( running_machine *machine, bitmap_t *bitmap, c if (fy) fy = 0; else fy = 1; mult = 16; } - else + else mult = -16; while (multi >= 0) @@ -96,12 +96,12 @@ static void jumpkids_draw_sprites( running_machine *machine, bitmap_t *bitmap, c int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = spriteram[offs + 1] & 0x7fff; - if (!sprite) + if (!sprite) continue; y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs+2]; @@ -135,7 +135,7 @@ static void jumpkids_draw_sprites( running_machine *machine, bitmap_t *bitmap, c if (fy) fy = 0; else fy = 1; mult = 16; } - else + else mult = -16; while (multi >= 0) @@ -163,12 +163,12 @@ static void fncywld_draw_sprites( running_machine *machine, bitmap_t *bitmap, co int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = spriteram[offs + 1] & 0x3fff; - if (!sprite) + if (!sprite) continue; y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2]; @@ -611,14 +611,14 @@ VIDEO_UPDATE( tumblepb ) state->flipscreen = state->control_0[0] & 0x80; tilemap_set_flip_all(screen->machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (state->flipscreen) - offs = 1; - else + if (state->flipscreen) + offs = 1; + else offs = -1; - if (state->flipscreen) - offs2 = -3; - else + if (state->flipscreen) + offs2 = -3; + else offs2 = -5; tilemap_set_scrollx(state->pf1_tilemap, 0, state->control_0[1] + offs2); @@ -647,14 +647,14 @@ VIDEO_UPDATE( jumpkids ) state->flipscreen = state->control_0[0] & 0x80; tilemap_set_flip_all(screen->machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (state->flipscreen) - offs = 1; - else + if (state->flipscreen) + offs = 1; + else offs = -1; - if (state->flipscreen) - offs2 = -3; - else + if (state->flipscreen) + offs2 = -3; + else offs2 = -5; tilemap_set_scrollx(state->pf1_tilemap, 0, state->control_0[1] + offs2); @@ -683,14 +683,14 @@ VIDEO_UPDATE( semicom ) state->flipscreen = state->control_0[0] & 0x80; tilemap_set_flip_all(screen->machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (state->flipscreen) - offs = 1; - else + if (state->flipscreen) + offs = 1; + else offs = -1; - if (state->flipscreen) - offs2 = -3; - else + if (state->flipscreen) + offs2 = -3; + else offs2 = -5; tilemap_set_scrollx(state->pf1_tilemap, 0, state->control_0[1] + offs2); @@ -749,15 +749,15 @@ VIDEO_UPDATE( bcstory ) tilemap_set_flip_all(screen->machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); /* not sure of this */ - if (state->flipscreen) - offs = 1; - else + if (state->flipscreen) + offs = 1; + else offs = 8; /* not sure of this */ - if (state->flipscreen) - offs2 = -3; - else + if (state->flipscreen) + offs2 = -3; + else offs2 = 8; tilemap_set_scrollx(state->pf1_tilemap, 0, state->control_0[1] + offs2); @@ -845,14 +845,14 @@ VIDEO_UPDATE( fncywld ) state->flipscreen = state->control_0[0] & 0x80; tilemap_set_flip_all(screen->machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (state->flipscreen) - offs = 1; - else + if (state->flipscreen) + offs = 1; + else offs = -1; - if (state->flipscreen) - offs2 = -3; - else + if (state->flipscreen) + offs2 = -3; + else offs2 = -5; tilemap_set_scrollx(state->pf1_tilemap, 0, state->control_0[1] + offs2); @@ -942,14 +942,14 @@ VIDEO_UPDATE( pangpang ) state->flipscreen = state->control_0[0] & 0x80; tilemap_set_flip_all(screen->machine, state->flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - if (state->flipscreen) - offs = 1; - else + if (state->flipscreen) + offs = 1; + else offs = -1; - if (state->flipscreen) - offs2 = -3; - else + if (state->flipscreen) + offs2 = -3; + else offs2 = -5; tilemap_set_scrollx(state->pf1_tilemap, 0, state->control_0[1] + offs2); diff --git a/src/mame/video/tumblep.c b/src/mame/video/tumblep.c index bd7b6c17402..d4ed2fe972b 100644 --- a/src/mame/video/tumblep.c +++ b/src/mame/video/tumblep.c @@ -28,12 +28,12 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; sprite = spriteram[offs + 1]; - if (!sprite) + if (!sprite) continue; y = spriteram[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spriteram[offs + 2]; diff --git a/src/mame/video/vaportra.c b/src/mame/video/vaportra.c index e79f481673a..87ddad06a99 100644 --- a/src/mame/video/vaportra.c +++ b/src/mame/video/vaportra.c @@ -60,19 +60,19 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int x, y, sprite, colour, multi, fx, fy, inc, flash, mult; y = buffered_spriteram[offs]; - if ((y & 0x8000) == 0) + if ((y & 0x8000) == 0) continue; sprite = buffered_spriteram[offs + 1] & 0x1fff; x = buffered_spriteram[offs + 2]; colour = (x >> 12) & 0xf; - if (pri && (colour >= priority_value)) + if (pri && (colour >= priority_value)) continue; - if (!pri && !(colour >= priority_value)) + if (!pri && !(colour >= priority_value)) continue; flash = x & 0x800; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; fx = y & 0x2000; @@ -86,7 +86,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect x = 240 - x; y = 240 - y; - if (x > 256) + if (x > 256) continue; /* Speedup */ sprite &= ~multi; @@ -133,28 +133,28 @@ VIDEO_UPDATE( vaportra ) deco16ic_pf34_update(state->deco16ic, 0, 0); /* Draw playfields */ - if (pri == 0) + if (pri == 0) { deco16ic_tilemap_4_draw(state->deco16ic, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, 0, 0); draw_sprites(screen->machine, bitmap, cliprect, 0); deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 0); } - else if (pri == 1) + else if (pri == 1) { deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); deco16ic_tilemap_4_draw(state->deco16ic, bitmap, cliprect, 0, 0); draw_sprites(screen->machine, bitmap, cliprect, 0); deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 0); } - else if (pri == 2) + else if (pri == 2) { deco16ic_tilemap_4_draw(state->deco16ic, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 0); draw_sprites(screen->machine, bitmap, cliprect, 0); deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, 0, 0); } - else + else { deco16ic_tilemap_3_draw(state->deco16ic, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); deco16ic_tilemap_2_draw(state->deco16ic, bitmap, cliprect, 0, 0); diff --git a/src/version.c b/src/version.c index adae68d92c6..cfec33171c9 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.136u3 ("__DATE__")"; +const char build_version[] = "0.136u4 ("__DATE__")";