From 2e7d262931b6840b77bda76a4b07c67b0f836b10 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 14 Aug 2008 07:36:27 +0000 Subject: [PATCH] 02113: xymg: xymg title mispelled 02110: All sets in cps3.c: video from a DV cam proves the refresh rate of CPS3 in MAME is wrong 02095: chqflag, chqflagj, -listxml: memory leaks --- src/emu/inptport.c | 14 ++++++++++++++ src/mame/drivers/chqflag.c | 4 ++-- src/mame/drivers/cps3.c | 3 ++- src/mame/drivers/gottlieb.c | 2 +- src/mame/drivers/igs_blit.c | 2 +- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/emu/inptport.c b/src/emu/inptport.c index caa2799b151..7693c0e2555 100644 --- a/src/emu/inptport.c +++ b/src/emu/inptport.c @@ -2610,6 +2610,12 @@ static input_port_config *port_config_detokenize(input_port_config *listhead, co TOKEN_SKIP_STRING(ipt); break; } + if (curfield->diploclist != NULL) + { + error_buf_append(errorbuf, errorbuflen, "multiple INPUT_TOKEN_DIPLOCATIONs encountered for a single field\n"); + TOKEN_SKIP_STRING(ipt); + break; + } curfield->diploclist = diplocation_list_alloc(curfield, TOKEN_GET_STRING(ipt), errorbuf, errorbuflen); break; @@ -2862,7 +2868,15 @@ static input_port_config *port_config_detokenize(input_port_config *listhead, co curfield->seq[SEQ_TYPE_STANDARD].code[0] = KEYCODE_F2; } if (hasdiploc) + { + if (curfield->diploclist != NULL) + { + error_buf_append(errorbuf, errorbuflen, "multiple INPUT_TOKEN_DIPLOCATIONs encountered for a single field\n"); + TOKEN_SKIP_STRING(ipt); + break; + } curfield->diploclist = diplocation_list_alloc(curfield, TOKEN_GET_STRING(ipt), errorbuf, errorbuflen); + } temptoken.i = INPUT_STRING_Off; cursetting = setting_config_alloc(curfield, defval & mask, input_port_string_from_token(temptoken)); diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index c56ec4b2895..f0ae2dc6a94 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -240,8 +240,8 @@ static INPUT_PORTS_START( chqflag ) PORT_DIPSETTING( 0x0b, DEF_STR( 1C_5C ) ) PORT_DIPSETTING( 0x0a, DEF_STR( 1C_6C ) ) PORT_DIPSETTING( 0x09, DEF_STR( 1C_7C ) ) - PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) PORT_DIPLOCATION("SW1:5,6,7,8") - PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) + PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7,8") PORT_DIPSETTING( 0x20, DEF_STR( 4C_1C ) ) PORT_DIPSETTING( 0x50, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x80, DEF_STR( 2C_1C ) ) diff --git a/src/mame/drivers/cps3.c b/src/mame/drivers/cps3.c index f00307bf203..06f0941e2b8 100644 --- a/src/mame/drivers/cps3.c +++ b/src/mame/drivers/cps3.c @@ -2668,7 +2668,8 @@ static MACHINE_DRIVER_START( cps3 ) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) - MDRV_SCREEN_REFRESH_RATE(60) + MDRV_SCREEN_REFRESH_RATE(59.633333) /* just a guess for now, based on previous games */ + /* however Mantis bug 2110 suggests it may be slightly different */ MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_SIZE(512*2, 224*2) diff --git a/src/mame/drivers/gottlieb.c b/src/mame/drivers/gottlieb.c index c2f9b95e42e..8fd857c99bd 100644 --- a/src/mame/drivers/gottlieb.c +++ b/src/mame/drivers/gottlieb.c @@ -2579,7 +2579,7 @@ GAME( 1984, curvebal, 0, gottlieb1, curvebal, romtiles, ROT270, "Mylstar" /* games using rev 2 sound board */ GAME( 1983, screwloo, 0, gottlieb2, screwloo, romtiles, ROT0, "Mylstar", "Screw Loose (prototype)", 0 ) GAME( 1983, mach3, 0, g2laser, mach3, romtiles, ROT0, "Mylstar", "M.A.C.H. 3", GAME_NOT_WORKING ) -GAME( 1984, cobram3, 0, g2laser, mach3, romtiles, ROT0, "Data East","Cobra Command", GAME_NOT_WORKING ) +GAME( 1984, cobram3, 0, g2laser, mach3, romtiles, ROT0, "Data East","Cobra Command (M.A.C.H. 3 hardware)", GAME_NOT_WORKING ) GAME( 1984, usvsthem, 0, g2laser, usvsthem, romtiles, ROT0, "Mylstar", "Us vs. Them", GAME_NOT_WORKING ) GAME( 1984, 3stooges, 0, gottlieb2, 3stooges, stooges, ROT0, "Mylstar", "The Three Stooges In Brides Is Brides", 0 ) GAME( 1984, vidvince, 0, gottlieb2, vidvince, vidvince, ROT0, "Mylstar", "Video Vince and the Game Factory (prototype)", GAME_IMPERFECT_GRAPHICS ) // sprite wrapping issues diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c index dffa47c9977..bec17a06967 100644 --- a/src/mame/drivers/igs_blit.c +++ b/src/mame/drivers/igs_blit.c @@ -3369,7 +3369,7 @@ GAME( 1995, lhb, 0, lhb, lhb, lhb, ROT0, "IGS", GAME( 1995, lhba, lhb, lhb, lhb, lhba, ROT0, "IGS", "Long Hu Bang (V033C)", 0 ) GAME( 1995, dbc, 0, lhb, lhb, dbc, ROT0, "IGS", "Da Ban Cheng (V027H)", 0 ) GAME( 1996, chmplst2, 0, chmplst2, chmplst2, chmplst2, ROT0, "IGS", "Long Hu Bang II (V185H)", 0 ) -GAME( 1996, xymg, 0, xymg, xymg, xymg, ROT0, "IGS", "Xing Yen Man Guan (V651C)", 0 ) +GAME( 1996, xymg, 0, xymg, xymg, xymg, ROT0, "IGS", "PinYin: Xing Yun Man Guan (V651C)", 0 ) GAME( 1996, grtwall, xymg, grtwall, grtwall, grtwall, ROT0, "IGS", "Wan Li Chang Cheng (V638C)", 0 ) GAME( 1996, vbowl, 0, vbowl, vbowl, vbowl, ROT0, "IGS", "Virtua Bowling (World, V101XCM)", GAME_IMPERFECT_SOUND ) GAME( 1996, vbowlj, vbowl, vbowl, vbowlj, vbowlj, ROT0, "IGS / Alta", "Virtua Bowling (Japan, V100JCM)", GAME_IMPERFECT_SOUND )