From 75797547cfa9c7e3b517ffd1d36cb29af116a340 Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Mon, 1 Mar 2010 15:58:15 +0000 Subject: [PATCH] Removed the coin latch kludge in the MACS driver [Angelo Salese] --- src/mame/drivers/macs.c | 42 ++++++++++++++++++++++++++++++++++------- src/mame/video/st0016.c | 8 -------- 2 files changed, 35 insertions(+), 15 deletions(-) diff --git a/src/mame/drivers/macs.c b/src/mame/drivers/macs.c index 6502daf4020..ba70b040b12 100644 --- a/src/mame/drivers/macs.c +++ b/src/mame/drivers/macs.c @@ -328,7 +328,7 @@ static INPUT_PORTS_START( macs_base ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static INPUT_PORTS_START( macs_m) +static INPUT_PORTS_START( macs_m ) PORT_INCLUDE( macs_base ) /*MAHJONG PANEL*/ @@ -375,7 +375,35 @@ static INPUT_PORTS_START( macs_m) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END -static INPUT_PORTS_START( macs_h) +static INPUT_PORTS_START( kisekaem ) + PORT_INCLUDE( macs_m ) + + PORT_MODIFY("SYS1") + PORT_DIPNAME( 0x01, 0x01, "SYS1 - BIT 1" ) + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_DIPNAME( 0x04, 0x04, "BIT 4" ) + PORT_DIPSETTING( 0x04, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x08, 0x08, "BIT 8" ) + PORT_DIPSETTING( 0x08, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x10, 0x10, "BIT 10" ) + PORT_DIPSETTING( 0x10, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x20, 0x20, "BIT 20" ) + PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x40, 0x40, "BIT 40" ) + PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPNAME( 0x80, 0x00, "BIT 80" ) + PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) +INPUT_PORTS_END + +static INPUT_PORTS_START( macs_h ) PORT_INCLUDE( macs_base ) /*HANAFUDA PANEL*/ @@ -711,8 +739,8 @@ static DRIVER_INIT(kisekaem) GAME( 1995, macsbios, 0, macs, macs_m, macs, ROT0, "I'Max", "Multi Amenity Cassette System BIOS", GAME_IS_BIOS_ROOT | GAME_IMPERFECT_SOUND | GAME_NOT_WORKING ) GAME( 1995, mac2bios, 0, macs, macs_m, macs2, ROT0, "I'Max", "Multi Amenity Cassette System 2 BIOS", GAME_IS_BIOS_ROOT | GAME_IMPERFECT_SOUND | GAME_NOT_WORKING ) -GAME( 1995, kisekaem, macsbios, macs, macs_m, kisekaem, ROT0, "I'Max", "Kisekae Mahjong", GAME_NOT_WORKING|GAME_IMPERFECT_SOUND ) -GAME( 1995, kisekaeh, macsbios, macs, macs_h, kisekaeh, ROT0, "I'Max", "Kisekae Hanafuda", GAME_NOT_WORKING |GAME_IMPERFECT_SOUND) -GAME( 1996, cultname, macsbios, macs, macs_m, macs, ROT0, "I'Max", "Seimei-Kantei-Meimei-Ki Cult Name", GAME_NOT_WORKING |GAME_IMPERFECT_SOUND) -GAME( 1999, yuka, macsbios, macs, macs_h, macs2, ROT0, "Yubis / T.System", "Yu-Ka", 0 ) -GAME( 1999, yujan, macsbios, macs, macs_m, macs2, ROT0, "Yubis / T.System", "Yu-Jan", 0 ) +GAME( 1995, kisekaem, macsbios, macs, kisekaem, kisekaem, ROT0, "I'Max", "Kisekae Mahjong", GAME_NOT_WORKING|GAME_IMPERFECT_SOUND ) +GAME( 1995, kisekaeh, macsbios, macs, macs_h, kisekaeh, ROT0, "I'Max", "Kisekae Hanafuda", GAME_NOT_WORKING |GAME_IMPERFECT_SOUND) +GAME( 1996, cultname, macsbios, macs, macs_m, macs, ROT0, "I'Max", "Seimei-Kantei-Meimei-Ki Cult Name", GAME_NOT_WORKING |GAME_IMPERFECT_SOUND) +GAME( 1999, yuka, macsbios, macs, macs_h, macs2, ROT0, "Yubis / T.System", "Yu-Ka", 0 ) +GAME( 1999, yujan, macsbios, macs, macs_m, macs2, ROT0, "Yubis / T.System", "Yu-Jan", 0 ) diff --git a/src/mame/video/st0016.c b/src/mame/video/st0016.c index d71c93a8377..19054aa3bcd 100644 --- a/src/mame/video/st0016.c +++ b/src/mame/video/st0016.c @@ -659,14 +659,6 @@ VIDEO_UPDATE( st0016 ) } else { - if(ISMACS1) - { - if(!(input_port_read(screen->machine, "SYS1")&1)) //fake coins - MACS2 system - { - macs_ram2[0]++; - } - } - bitmap_fill(bitmap,cliprect,UNUSED_PEN); draw_bgmap(screen->machine, bitmap,cliprect,0); draw_sprites(screen->machine, bitmap,cliprect);