diff --git a/src/mame/cirsa/neptunp2.cpp b/src/mame/cirsa/neptunp2.cpp index c43f17a5d87..17978a502d6 100644 --- a/src/mame/cirsa/neptunp2.cpp +++ b/src/mame/cirsa/neptunp2.cpp @@ -416,7 +416,7 @@ ROM_START( ccorsario ) ROM_END // '960606-5 PCB and 'CB1 (CS4)' security counters module. CPLD labeled as 'PD03'. This is mechanical. -ROM_START( ccorsaria ) +ROM_START( ccorsarioa ) ROM_REGION( 0x100000, "maincpu", 0 ) ROM_LOAD( "c_corsarios_50_b-hm0023_b_5.01_cat_b-0082.u2", 0x000000, 0x080000, CRC(b262a36d) SHA1(6c403e5418cde12da87148a44084c7a8866c5005) ) ROM_LOAD( "c_corsarios_50_b-hm0023_b_5.01_cat_b-0082.u3", 0x080000, 0x080000, CRC(fda606f4) SHA1(5f17fe5139e15c738b0c6e354f43221a3a60d807) ) @@ -651,7 +651,7 @@ GAME( 2008, perlacrb, 0, neptunp2_video, neptunp2, neptunp2_state, // Screenless games on Cirsa "960606-5" CPU PCB GAME( 1999, ccorsario, 0, neptunp2_no_video, c960606, neptunp2_state, empty_init, ROT0, "Unidesa/Cirsa", "Corsarios (Cirsa slot machine, V6.0D)", MACHINE_IS_SKELETON_MECHANICAL ) // Year taken from sticker on PCB -GAME( 1999, ccorsaria, ccorsario, neptunp2_no_video, c960606, neptunp2_state, empty_init, ROT0, "Unidesa/Cirsa", "Corsarios (Cirsa slot machine, V5.10D, Catalonia)", MACHINE_IS_SKELETON_MECHANICAL ) // Year taken from sticker on PCB +GAME( 1999, ccorsarioa, ccorsario, neptunp2_no_video, c960606, neptunp2_state, empty_init, ROT0, "Unidesa/Cirsa", "Corsarios (Cirsa slot machine, V5.10D, Catalonia)", MACHINE_IS_SKELETON_MECHANICAL ) // Year taken from sticker on PCB GAME( 2002?, charles, 0, neptunp2_no_video, c960606, neptunp2_state, empty_init, ROT0, "Unidesa/Cirsa/Europea", "Charleston (V2.1, Catalonia)", MACHINE_IS_SKELETON_MECHANICAL ) // Year taken from sticker on PCB GAME( 2008, gladiador, 0, neptunp2_no_video, c960606, neptunp2_state, empty_init, ROT0, "Unidesa/Cirsa", "Gladiadores (V1.0, CAA)", MACHINE_IS_SKELETON_MECHANICAL ) // Year taken from manual GAME( 2006, mltpoints, 0, neptunp2_no_video, c960606, neptunp2_state, empty_init, ROT0, "Unidesa/Cirsa", "Multi Points (V1.0, CAA)", MACHINE_IS_SKELETON_MECHANICAL ) // Year taken from manual diff --git a/src/mame/liberty/freedom200.cpp b/src/mame/liberty/freedom200.cpp index 153e0f3c4d6..0d88301c12f 100644 --- a/src/mame/liberty/freedom200.cpp +++ b/src/mame/liberty/freedom200.cpp @@ -245,7 +245,10 @@ SCN2674_DRAW_CHARACTER_MEMBER( freedom200_state::draw_character ) // reverse video? if (BIT(m_video_ctrl, 1)) - std::swap(fg, bg); + { + using std::swap; + swap(fg, bg); + } // draw 8 pixels of the character if (dw) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index e007baefc7d..31caedd01a1 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -16312,7 +16312,7 @@ bg_ddb // bg_max // bg_maxa // ccorsario // (c) 2002 Cirsa / Unidesa -ccorsaria // (c) 2002 Cirsa / Unidesa +ccorsarioa // (c) 2002 Cirsa / Unidesa charles // (c) 2002? Cirsa / Unidesa / Europea gladiador // (c) 2008 Cirsa / Unidesa mltpoints // (c) 2006 Cirsa / Unidesa diff --git a/src/mame/misc/gms.cpp b/src/mame/misc/gms.cpp index 71c6b1414de..e6e156ec1f3 100644 --- a/src/mame/misc/gms.cpp +++ b/src/mame/misc/gms.cpp @@ -1141,7 +1141,7 @@ static INPUT_PORTS_START( sscs ) PORT_DIPSETTING( 0x0001, "20" ) PORT_DIPSETTING( 0x0002, "50" ) PORT_DIPSETTING( 0x0003, "80" ) - PORT_DIPNAME( 0x000c, 0x0000, "Main Game Blast Score" ) PORT_DIPLOCATION("SW3:3,4") // 主遊戲爆機分數 + PORT_DIPNAME( 0x000c, 0x0000, "Main Game Win Points" ) PORT_DIPLOCATION("SW3:3,4") // 主遊戲爆機分數 PORT_DIPSETTING( 0x0004, "10,000" ) PORT_DIPSETTING( 0x0000, "20,000" ) PORT_DIPSETTING( 0x0008, "50,000" ) diff --git a/src/mame/tvgames/elan_eu3a14.cpp b/src/mame/tvgames/elan_eu3a14.cpp index 03996465596..fc77864a688 100644 --- a/src/mame/tvgames/elan_eu3a14.cpp +++ b/src/mame/tvgames/elan_eu3a14.cpp @@ -250,6 +250,7 @@ void elan_eu3a14_state::radica_eu3a14_map(address_map& map) //map(0xfffe, 0xffff).r(m_sys, FUNC(elan_eu3a05commonsys_device::irq_vector_r)); // allow normal IRQ for brk } + static INPUT_PORTS_START( eu3a14 ) PORT_START("IN0") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) @@ -261,6 +262,7 @@ static INPUT_PORTS_START( eu3a14 ) PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) INPUT_PORTS_END + static INPUT_PORTS_START( rad_gtg ) PORT_START("IN0") PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) @@ -971,6 +973,7 @@ ROM_END } // anonymous namespace + CONS( 2006, rad_gtg, 0, 0, radica_eu3a14_altrambase_adc, rad_gtg, elan_eu3a14_state, empty_init, "Radica / FarSight Studios (licensed from Incredible Technologies)", "Golden Tee Golf: Home Edition", MACHINE_NOT_WORKING ) CONS( 2005, rad_rsg, 0, 0, radica_eu3a14_altrambase, rad_rsg, elan_eu3a14_state, empty_init, "Radica / FarSight Studios", "Play TV Real Swing Golf", MACHINE_NOT_WORKING ) diff --git a/src/mame/tvgames/spg2xx_playvision.cpp b/src/mame/tvgames/spg2xx_playvision.cpp index 02ed3b9988b..f15f85a156b 100644 --- a/src/mame/tvgames/spg2xx_playvision.cpp +++ b/src/mame/tvgames/spg2xx_playvision.cpp @@ -232,5 +232,6 @@ ROM_END } // anonymous namespace + // see note for the pvmil8 set in tvgames/elan_eu3a05.cpp CONS( 2006, pvmil, 0, 0, pvmil, pvmil, pvmil_state, empty_init, "Play Vision", "Who Wants to Be a Millionaire? (Play Vision, Plug and Play, UK, 16-bit version)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )