From 7b46b4368e0aeb10eea0fc31858e247b10ac1edb Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 15 Oct 2019 13:04:10 -0400 Subject: [PATCH] hitme.cpp: Rename m21 to mirco21 to resolve name collision --- src/mame/drivers/hitme.cpp | 4 ++-- src/mame/mame.lst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mame/drivers/hitme.cpp b/src/mame/drivers/hitme.cpp index 85f00383a99..47d12658f37 100644 --- a/src/mame/drivers/hitme.cpp +++ b/src/mame/drivers/hitme.cpp @@ -638,7 +638,7 @@ ROM_START( hitme1 ) ROM_LOAD( "hmcg.h7", 0x0000, 0x0200, CRC(818f5fbe) SHA1(e2b3349e51ba57d14f3388ba93891bc6274b7a14) ) ROM_END -ROM_START( m21 ) +ROM_START( mirco21 ) ROM_REGION( 0x2000, "maincpu", ROMREGION_INVERT ) ROM_LOAD( "mirco1.bin", 0x0000, 0x0200, CRC(aa796ad7) SHA1(2908bdb4ab17a2f5bc4da2f957906bf2b57afa50) ) ROM_LOAD( "hm2.c7", 0x0200, 0x0200, CRC(25d47ba4) SHA1(6f3bb4ca6918dc07f37d0c0c7fe5ec53aa7171a5) ) @@ -693,7 +693,7 @@ ROM_END GAME( 1976, hitme, 0, hitme, hitme, hitme_state, empty_init, ROT0, "Ramtek", "Hit Me (set 1)", MACHINE_SUPPORTS_SAVE ) // 05/1976 GAME( 1976, hitme1, hitme, hitme, hitme, hitme_state, empty_init, ROT0, "Ramtek", "Hit Me (set 2)", MACHINE_SUPPORTS_SAVE ) -GAME( 1976, m21, hitme, hitme, hitme, hitme_state, empty_init, ROT0, "Mirco Games", "21 (Mirco)", MACHINE_SUPPORTS_SAVE ) // 08/1976, licensed? +GAME( 1976, mirco21, hitme, hitme, hitme, hitme_state, empty_init, ROT0, "Mirco Games", "21 (Mirco)", MACHINE_SUPPORTS_SAVE ) // 08/1976, licensed? GAME( 1978, super21, 0, hitme, super21, hitme_state, empty_init, ROT0, "Mirco Games", "Super Twenty One", MACHINE_SUPPORTS_SAVE ) GAMEL(1976, barricad, 0, barricad, barricad, hitme_state, empty_init, ROT0, "Ramtek", "Barricade", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barricad ) GAMEL(1976, brickyrd, barricad, barricad, barricad, hitme_state, empty_init, ROT0, "Ramtek", "Brickyard", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barricad ) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 0bc720ae5a7..c1e069cbb1a 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -15731,7 +15731,7 @@ barricad // (c) 1976 Ramtek brickyrd // (c) 1976 Ramtek hitme // (c) 05/1976 Ramtek hitme1 // (c) 05/1976 Ramtek -m21 // (c) 08/1976 Mirco +mirco21 // (c) 08/1976 Mirco super21 // (c) 1978 Mirco @source:hitpoker.cpp