From 9476c50ee6715f42a0fe84e1a5ce5fd40ff0aa73 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Mon, 24 Mar 2008 04:07:46 +0000 Subject: Cleanups for 0.124. Marked Mermaid as working per checkin comment. --- src/emu/drawgfx.c | 38 +++++++++++++++++++------------------- src/emu/memory.c | 2 +- src/emu/sound/msm5232.c | 2 +- src/emu/validity.c | 2 +- src/emu/video/cdp1869.c | 6 +++--- src/lib/util/xmlfile.c | 8 ++++---- src/mame/drivers/cidelsa.c | 4 ++-- src/mame/drivers/equites.c | 8 ++++---- src/mame/drivers/mermaid.c | 4 ++-- src/mame/drivers/orbit.c | 4 ++-- src/mame/video/cps1.c | 10 +++++----- src/mame/video/mermaid.c | 12 ++++++------ 12 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/emu/drawgfx.c b/src/emu/drawgfx.c index 67d6fbfceaa..712c6fb5e23 100644 --- a/src/emu/drawgfx.c +++ b/src/emu/drawgfx.c @@ -1267,7 +1267,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (((1 << pri[x]) & pri_mask) == 0) dest[x] = pal[(source[x_index>>17] >> ((x_index & 0x10000) >> 14)) & 0x0f]; -// dest[x] = colorbase + ((source[x_index>>17] >> ((x_index & 0x10000) >> 14)) & 0x0f); +// dest[x] = colorbase + ((source[x_index>>17] >> ((x_index & 0x10000) >> 14)) & 0x0f); pri[x] = 31; x_index += dx; } @@ -1286,7 +1286,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (((1 << pri[x]) & pri_mask) == 0) dest[x] = pal[source[x_index>>16]]; -// dest[x] = colorbase + source[x_index>>16]; +// dest[x] = colorbase + source[x_index>>16]; pri[x] = 31; x_index += dx; } @@ -1306,7 +1306,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, for (x = sx; x < ex; x++) { dest[x] = pal[(source[x_index>>17] >> ((x_index & 0x10000) >> 14)) & 0x0f]; -// dest[x] = colorbase + ((source[x_index>>17] >> ((x_index & 0x10000) >> 14)) & 0x0f); +// dest[x] = colorbase + ((source[x_index>>17] >> ((x_index & 0x10000) >> 14)) & 0x0f); x_index += dx; } @@ -1322,7 +1322,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, for (x = sx; x < ex; x++) { dest[x] = pal[source[x_index>>16]]; -// dest[x] = colorbase + source[x_index>>16]; +// dest[x] = colorbase + source[x_index>>16]; x_index += dx; } @@ -1351,7 +1351,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (((1 << pri[x]) & pri_mask) == 0) dest[x] = pal[c]; -// dest[x] = colorbase + c; +// dest[x] = colorbase + c; pri[x] = 31; } x_index += dx; @@ -1374,7 +1374,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (((1 << pri[x]) & pri_mask) == 0) dest[x] = pal[c]; -// dest[x] = colorbase + c; +// dest[x] = colorbase + c; pri[x] = 31; } x_index += dx; @@ -1396,7 +1396,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { int c = (source[x_index>>17] >> ((x_index & 0x10000) >> 14)) & 0x0f; if( c != transparent_color ) dest[x] = pal[c]; -// if (c != transparent_color) dest[x] = colorbase + c; +// if (c != transparent_color) dest[x] = colorbase + c; x_index += dx; } @@ -1413,7 +1413,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { int c = source[x_index>>16]; if( c != transparent_color ) dest[x] = pal[c]; -// if (c != transparent_color) dest[x] = colorbase + c; +// if (c != transparent_color) dest[x] = colorbase + c; x_index += dx; } @@ -1483,7 +1483,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (((1 << pri[x]) & pri_mask) == 0) dest[x] = pal[c]; -// dest[x] = colorbase + c; +// dest[x] = colorbase + c; pri[x] = 31; } x_index += dx; @@ -1503,7 +1503,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, int c = source[x_index>>16]; if (((1 << c) & transparent_color) == 0) dest[x] = pal[c]; -// dest[x] = colorbase + c; +// dest[x] = colorbase + c; x_index += dx; } @@ -1541,10 +1541,10 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (ah & 0x80) dest[x] = palette_shadow_table[pal[c]]; -// dest[x] = palette_shadow_table[colorbase + c]; +// dest[x] = palette_shadow_table[colorbase + c]; else dest[x] = pal[c]; -// dest[x] = colorbase + c; +// dest[x] = colorbase + c; } pri[x] = (ah & 0x7f) | 31; break; @@ -1578,7 +1578,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { case DRAWMODE_SOURCE: dest[x] = pal[c]; -// dest[x] = colorbase + c; +// dest[x] = colorbase + c; break; case DRAWMODE_SHADOW: dest[x] = palette_shadow_table[dest[x]]; @@ -1611,7 +1611,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (((1 << pri[x]) & pri_mask) == 0) dest[x] = alpha_blend16(dest[x], pal[c]); -// dest[x] = alpha_blend16(dest[x], colorbase + c); +// dest[x] = alpha_blend16(dest[x], colorbase + c); pri[x] = 31; } x_index += dx; @@ -1630,7 +1630,7 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { int c = source[x_index>>16]; if( c != transparent_color ) dest[x] = alpha_blend16(dest[x], pal[c]); -// if (c != transparent_color) dest[x] = alpha_blend16(dest[x], colorbase + c); +// if (c != transparent_color) dest[x] = alpha_blend16(dest[x], colorbase + c); x_index += dx; } @@ -1658,10 +1658,10 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (gfx_alpharange_table[c] == 0xff) dest[x] = pal[c]; -// dest[x] = colorbase + c; +// dest[x] = colorbase + c; else dest[x] = alpha_blend_r16(dest[x], pal[c], gfx_alpharange_table[c]); -// dest[x] = alpha_blend_r16(dest[x], colorbase + c, gfx_alpharange_table[c]); +// dest[x] = alpha_blend_r16(dest[x], colorbase + c, gfx_alpharange_table[c]); } pri[x] = 31; } @@ -1684,10 +1684,10 @@ INLINE void common_drawgfxzoom( bitmap_t *dest_bmp,const gfx_element *gfx, { if (gfx_alpharange_table[c] == 0xff) dest[x] = pal[c]; -// dest[x] = colorbase + c; +// dest[x] = colorbase + c; else dest[x] = alpha_blend_r16(dest[x], pal[c], gfx_alpharange_table[c]); -// dest[x] = alpha_blend_r16(dest[x], colorbase + c, gfx_alpharange_table[c]); +// dest[x] = alpha_blend_r16(dest[x], colorbase + c, gfx_alpharange_table[c]); } x_index += dx; } diff --git a/src/emu/memory.c b/src/emu/memory.c index 4c695982f81..c0fa212448b 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -1459,7 +1459,7 @@ static void memory_init_cpudata(const machine_config *config) space->read.handlers[entrynum].handler.generic = get_static_handler(space->dbits, 0, spacenum, entrynum); space->write.handlers[entrynum].handler.generic = get_static_handler(space->dbits, 1, spacenum, entrynum); } - + /* make sure we fix up the mask for the unmap handler */ space->read.handlers[STATIC_UNMAP].bytemask = ~0; space->write.handlers[STATIC_UNMAP].bytemask = ~0; diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c index ab7a99a45c1..6a1509f6e4f 100644 --- a/src/emu/sound/msm5232.c +++ b/src/emu/sound/msm5232.c @@ -765,7 +765,7 @@ static void MSM5232_update_one(void *param, stream_sample_t **inputs, stream_sam cnt--; } } - + bufnoise[i] = (chip->noise_rng & (1<<16)) ? 32767 : 0; } } diff --git a/src/emu/validity.c b/src/emu/validity.c index d18c2ea8c8d..8143ce77aca 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -1045,7 +1045,7 @@ static int validate_inputs(int drivnum, const machine_config *config, input_port for (inp = *memory; inp->type != IPT_END; inp++) { int strindex = 0; - + /* check for duplicate tags */ if (inp->type == IPT_PORT) { diff --git a/src/emu/video/cdp1869.c b/src/emu/video/cdp1869.c index db60bf1ed88..1002fcdde4a 100644 --- a/src/emu/video/cdp1869.c +++ b/src/emu/video/cdp1869.c @@ -6,10 +6,10 @@ /* - TODO: + TODO: - - convert CDP1869 into a device with video/sound - - add predisplay/display timers + - convert CDP1869 into a device with video/sound + - add predisplay/display timers */ diff --git a/src/lib/util/xmlfile.c b/src/lib/util/xmlfile.c index 1bc99e0f102..3550609f5eb 100644 --- a/src/lib/util/xmlfile.c +++ b/src/lib/util/xmlfile.c @@ -534,9 +534,9 @@ const char *xml_normalize_string(const char *string) ***************************************************************************/ /*------------------------------------------------- - expat_malloc/expat_realloc/expat_free - - wrappers for memory allocation functions so - that they pass through out memory tracking + expat_malloc/expat_realloc/expat_free - + wrappers for memory allocation functions so + that they pass through out memory tracking systems -------------------------------------------------*/ @@ -563,7 +563,7 @@ static void expat_free(void *ptr) static int expat_setup_parser(xml_parse_info *parse_info, xml_parse_options *opts) { XML_Memory_Handling_Suite memcallbacks; - + /* setup parse_info structure */ memset(parse_info, 0, sizeof(*parse_info)); if (opts != NULL) diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c index 28e5f87e807..8729c6f4bf3 100644 --- a/src/mame/drivers/cidelsa.c +++ b/src/mame/drivers/cidelsa.c @@ -10,8 +10,8 @@ TODO: - - auto_malloc cidelsa_pcb - - move set_cpu_mode timer call to MDRV + - auto_malloc cidelsa_pcb + - move set_cpu_mode timer call to MDRV - fix COP420 core to get sound in Draco */ diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c index 7b64c57355e..09bd44725e1 100644 --- a/src/mame/drivers/equites.c +++ b/src/mame/drivers/equites.c @@ -517,10 +517,10 @@ if (data & ~ay_port_b & 0x04) hihat++; // FIXME I'm just enabling the MSM5232 Noise Output for now. Proper emulation // of the analog circuitry should be done instead. -// if (data & ~ay_port_b & 0x08) cymbal hit trigger -// if (data & ~ay_port_b & 0x04) hi-hat hit trigger -// data & 3 cymbal volume -// data & 0x40 hi-hat enable +// if (data & ~ay_port_b & 0x08) cymbal hit trigger +// if (data & ~ay_port_b & 0x04) hi-hat hit trigger +// data & 3 cymbal volume +// data & 0x40 hi-hat enable if (data & ~ay_port_b & 0x08) cymvol = 1.0f; diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c index 829caca78e7..726d1a51f8c 100644 --- a/src/mame/drivers/mermaid.c +++ b/src/mame/drivers/mermaid.c @@ -390,6 +390,6 @@ ROM_END /* Game Drivers */ -GAME( 1982, mermaid, 0, mermaid, mermaid, 0, ROT0, "[Sanritsu] Rock-Ola", "Mermaid", GAME_NOT_WORKING ) -GAME( 1982, yachtmn, mermaid, mermaid, mermaid, 0, ROT0, "[Sanritsu] Esco", "Yachtsman", GAME_NOT_WORKING ) +GAME( 1982, mermaid, 0, mermaid, mermaid, 0, ROT0, "[Sanritsu] Rock-Ola", "Mermaid", 0 ) +GAME( 1982, yachtmn, mermaid, mermaid, mermaid, 0, ROT0, "[Sanritsu] Esco", "Yachtsman", 0 ) GAME( 1982, rougien, 0, mermaid, mermaid, 0, ROT0, "Sanritsu", "Rougien", 0 ) diff --git a/src/mame/drivers/orbit.c b/src/mame/drivers/orbit.c index 72f8fbebb3b..ccc0b50c951 100644 --- a/src/mame/drivers/orbit.c +++ b/src/mame/drivers/orbit.c @@ -263,7 +263,7 @@ static const gfx_layout orbit_lower_sprite_layout = static const gfx_layout orbit_tile_layout = { - 8, 8, + 8, 8, RGN_FRAC(1,1), 1, { 0 }, @@ -294,7 +294,7 @@ static MACHINE_DRIVER_START( orbit ) MDRV_CPU_ADD(M6800, MASTER_CLOCK / 16) MDRV_CPU_PROGRAM_MAP(orbit_map, 0) MDRV_CPU_VBLANK_INT("main", orbit_interrupt) - + MDRV_TIMER_ADD_SCANLINE("32V", nmi_32v, "main", 0, 32) MDRV_MACHINE_RESET(orbit) diff --git a/src/mame/video/cps1.c b/src/mame/video/cps1.c index ea70cc28d39..d37a68eccca 100644 --- a/src/mame/video/cps1.c +++ b/src/mame/video/cps1.c @@ -1384,7 +1384,7 @@ static void cps1_render_sprites(running_machine *machine, bitmap_t *bitmap, cons sy = (y+nys*16) & 0x1ff; DRAWSPRITE( -// code+(nx-1)-nxs+0x10*(ny-1-nys), +// code+(nx-1)-nxs+0x10*(ny-1-nys), (code & ~0xf) + ((code + (nx-1) - nxs) & 0xf) + 0x10*(ny-1-nys), (col&0x1f) + palette_basecolor[0], 1,1, @@ -1402,7 +1402,7 @@ static void cps1_render_sprites(running_machine *machine, bitmap_t *bitmap, cons sy = (y+nys*16) & 0x1ff; DRAWSPRITE( -// code+nxs+0x10*(ny-1-nys), +// code+nxs+0x10*(ny-1-nys), (code & ~0xf) + ((code + nxs) & 0xf) + 0x10*(ny-1-nys), (col&0x1f) + palette_basecolor[0], 0,1, @@ -1423,7 +1423,7 @@ static void cps1_render_sprites(running_machine *machine, bitmap_t *bitmap, cons sy = (y+nys*16) & 0x1ff; DRAWSPRITE( -// code+(nx-1)-nxs+0x10*nys, +// code+(nx-1)-nxs+0x10*nys, (code & ~0xf) + ((code + (nx-1) - nxs) & 0xf) + 0x10*nys, (col&0x1f) + palette_basecolor[0], 1,0, @@ -1441,8 +1441,8 @@ static void cps1_render_sprites(running_machine *machine, bitmap_t *bitmap, cons sy = (y+nys*16) & 0x1ff; DRAWSPRITE( -// code+nxs+0x10*nys, - (code & ~0xf) + ((code + nxs) & 0xf) + 0x10*nys, // fix 00406: qadj: When playing as the ninja, there is one broekn frame in his animation loop when walking. +// code+nxs+0x10*nys, + (code & ~0xf) + ((code + nxs) & 0xf) + 0x10*nys, // fix 00406: qadj: When playing as the ninja, there is one broekn frame in his animation loop when walking. (col&0x1f) + palette_basecolor[0], 0,0, sx,sy); diff --git a/src/mame/video/mermaid.c b/src/mame/video/mermaid.c index 8f919558a4a..8eeecf4414f 100644 --- a/src/mame/video/mermaid.c +++ b/src/mame/video/mermaid.c @@ -116,7 +116,7 @@ READ8_HANDLER( mermaid_collision_r ) Bit 5 Bit 6 - Sprite (Boat) - Sprite Bit 7 - */ + */ int collision = 0xff; @@ -245,7 +245,7 @@ VIDEO_EOF( mermaid ) int attr = spriteram[offs + 2]; int bank = (attr & 0x30) >> 4; int code = (spriteram[offs] & 0x3f) | (bank << 6); -// int color = attr & 0x0f; +// int color = attr & 0x0f; int flipx = spriteram[offs] & 0x40; int flipy = spriteram[offs] & 0x80; int sx = spriteram[offs + 3] + 1; @@ -317,7 +317,7 @@ VIDEO_EOF( mermaid ) int attr2 = spriteram[offs2 + 2]; int bank2 = (attr2 & 0x30) >> 4; int code2 = (spriteram[offs2] & 0x3f) | (bank2 << 6); -// int color2 = attr2 & 0x0f; +// int color2 = attr2 & 0x0f; int flipx2 = spriteram[offs2] & 0x40; int flipy2 = spriteram[offs2] & 0x80; int sx2 = spriteram[offs2 + 3] + 1; @@ -355,7 +355,7 @@ VIDEO_EOF( mermaid ) int attr = spriteram[offs + 2]; int bank = (attr & 0x30) >> 4; int code = (spriteram[offs] & 0x3f) | (bank << 6); -// int color = attr & 0x0f; +// int color = attr & 0x0f; int flipx = spriteram[offs] & 0x40; int flipy = spriteram[offs] & 0x80; int sx = spriteram[offs + 3] + 1; @@ -392,7 +392,7 @@ VIDEO_EOF( mermaid ) if (rect.max_y > visarea->max_y) rect.max_y = visarea->max_y; - // check collision sprite "sail" - sprite + // check collision sprite "sail" - sprite fillbitmap(helper,0,&rect); fillbitmap(helper2,0,&rect); @@ -403,7 +403,7 @@ VIDEO_EOF( mermaid ) int attr2 = spriteram[offs2 + 2]; int bank2 = (attr2 & 0x30) >> 4; int code2 = (spriteram[offs2] & 0x3f) | (bank2 << 6); -// int color2 = attr2 & 0x0f; +// int color2 = attr2 & 0x0f; int flipx2 = spriteram[offs2] & 0x40; int flipy2 = spriteram[offs2] & 0x80; int sx2 = spriteram[offs2 + 3] + 1; -- cgit v1.2.3