From 06976e040c5e1404bf5c388e7ab22d8b176dcb23 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 28 Sep 2020 01:17:03 +1000 Subject: adjusted some titles (lowercase for things that aren't actually part of the title itself) --- hash/clipper_flop.xml | 2 +- src/mame/drivers/8080bw.cpp | 8 ++++---- src/mame/drivers/konmedal68k.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hash/clipper_flop.xml b/hash/clipper_flop.xml index 3b0feca7825..d01ae11f508 100644 --- a/hash/clipper_flop.xml +++ b/hash/clipper_flop.xml @@ -4,7 +4,7 @@ license:CC0 --> - + System 1984 Professional Data Computer diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index fce3ba4df08..ff08f30ba54 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -5720,10 +5720,10 @@ GAME( 1979, sflush, 0, sflush, sflush, _8080bw_state, empty_i GAME( 1980, lupin3, 0, lupin3, lupin3, _8080bw_state, empty_init, ROT270, "Taito", "Lupin III (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) GAME( 1980, lupin3a, lupin3, lupin3a, lupin3a, _8080bw_state, empty_init, ROT270, "Taito", "Lupin III (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND ) -GAME( 1980, polaris, 0, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito", "Polaris (Latest version)", MACHINE_SUPPORTS_SAVE ) -GAME( 1980, polarisa, polaris, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito", "Polaris (Second revision)", MACHINE_SUPPORTS_SAVE ) -GAME( 1980, polarisb, polaris, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito", "Polaris (First revision)", MACHINE_SUPPORTS_SAVE ) -GAME( 1980, polariso, polaris, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito", "Polaris (Original version)", MACHINE_SUPPORTS_SAVE ) +GAME( 1980, polaris, 0, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito", "Polaris (latest version)", MACHINE_SUPPORTS_SAVE ) +GAME( 1980, polarisa, polaris, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito", "Polaris (second revision)", MACHINE_SUPPORTS_SAVE ) +GAME( 1980, polarisb, polaris, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito", "Polaris (first revision)", MACHINE_SUPPORTS_SAVE ) +GAME( 1980, polariso, polaris, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito", "Polaris (original version)", MACHINE_SUPPORTS_SAVE ) GAME( 1981, polarisbr, polaris, polaris, polaris, _8080bw_state, empty_init, ROT270, "Taito do Brasil", "Polaris (Brazil)", MACHINE_SUPPORTS_SAVE ) GAME( 1980, ballbomb, 0, ballbomb, ballbomb, _8080bw_state, empty_init, ROT270, "Taito", "Balloon Bomber", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) /* missing clouds */ diff --git a/src/mame/drivers/konmedal68k.cpp b/src/mame/drivers/konmedal68k.cpp index 02ce8da8538..ba1be6d096b 100644 --- a/src/mame/drivers/konmedal68k.cpp +++ b/src/mame/drivers/konmedal68k.cpp @@ -500,8 +500,8 @@ ROM_END GAME( 1995, kzaurus, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Pittanko Zaurus", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1996, dobouchn, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Dobou-Chan (ver JAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 199?, konslot, 0, slot, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Unknown Konami slot medal game (set 1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) -GAME( 199?, konslot2, 0, slot, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Unknown Konami slot medal game (set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 199?, konslot, 0, slot, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "unknown Konami slot medal game (set 1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) +GAME( 199?, konslot2, 0, slot, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "unknown Konami slot medal game (set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) GAME( 1997, koropens, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Korokoro Pensuke", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1998, kattobas, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Kattobase Power Pro Kun", MACHINE_IMPERFECT_GRAPHICS ) GAME( 1999, pwrchanc, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Powerful Chance", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS ) -- cgit v1.2.3 From 5001cd0ef47204e37c7a022725627c3a61a52ea8 Mon Sep 17 00:00:00 2001 From: arbee Date: Sun, 27 Sep 2020 19:23:30 -0400 Subject: mac: fix crash regression on macqd700 [R. Belmont] --- src/mame/drivers/mac.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index 899700e00e7..af3922aedac 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -1568,6 +1568,11 @@ void mac_state::macqd700(machine_config &config) add_via2(config); + MACADB(config, m_macadb, C15M); + m_macadb->via_clock_callback().set(m_via1, FUNC(via6522_device::write_cb1)); + m_macadb->via_data_callback().set(m_via1, FUNC(via6522_device::write_cb2)); + m_macadb->adb_irq_callback().set(FUNC(mac_state::adb_irq_w)); + scsi_port_device &scsibus(SCSI_PORT(config, "scsi")); scsibus.set_slot_device(1, "harddisk", SCSIHD, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_6)); scsibus.set_slot_device(2, "harddisk", SCSIHD, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_5)); -- cgit v1.2.3 From 1cd4c83c035d33f1a8261b411753b6fc2001c0ea Mon Sep 17 00:00:00 2001 From: arbee Date: Sun, 27 Sep 2020 20:02:47 -0400 Subject: mac128: possible fix for out-of-bounds ROM access [R. Belmont] --- src/mame/drivers/mac128.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/drivers/mac128.cpp b/src/mame/drivers/mac128.cpp index a6bdee192d3..9dcd7c3184e 100644 --- a/src/mame/drivers/mac128.cpp +++ b/src/mame/drivers/mac128.cpp @@ -336,7 +336,7 @@ uint16_t mac128_state::ram_r(offs_t offset) { if (m_overlay) { - return m_rom_ptr[offset]; + return m_rom_ptr[offset & 0x7ffff]; } return m_ram_ptr[offset & m_ram_mask]; -- cgit v1.2.3 From 102c64e434a9a0af94c7c67e05c92e5bf3808bbb Mon Sep 17 00:00:00 2001 From: Justin Kerk Date: Mon, 28 Sep 2020 10:04:36 -0700 Subject: Remove embed files unintentionally added to Emscripten build --- scripts/src/main.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/src/main.lua b/scripts/src/main.lua index c9e2aabfdd8..6ae28487563 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -165,8 +165,6 @@ end .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/essl@bgfx/shaders/essl" .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/bgfx@artwork/bgfx" .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png" - .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/popeye.zip@artwork/popeye.zip" - .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "roms@roms" if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then emccopts = emccopts -- cgit v1.2.3 From a1bd70348894b11adf2fe47d0b1c4f049eb1aec9 Mon Sep 17 00:00:00 2001 From: Roberto Fresca Date: Mon, 28 Sep 2020 22:13:28 +0200 Subject: Update arcade.lua Fix the arcade build (MASH) (cherry picked from commit 04a21129e8f3d5650809b48d368a473e263f09e0) --- scripts/target/mame/arcade.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 98d86d70a89..dfb89307d92 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -823,6 +823,7 @@ BUSES["ZORRO"] = true -- specify used file formats -------------------------------------------------- +FORMATS["APOLLO_DSK"] = true FORMATS["GUAB_DSK"] = true FORMATS["AMI_DSK"] = true FORMATS["SC3000_BIT"] = true -- cgit v1.2.3 From 5a1fd0cc172cf10c9519152391283a90da33d0c9 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 29 Sep 2020 17:23:27 +1000 Subject: Version bump for 0.225 --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 0c98d15c612..be78134bc00 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index cfd82733a69..1e1e7e44de7 100644 --- a/makefile +++ b/makefile @@ -1719,14 +1719,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.224"' > $@ + @echo '#define BARE_BUILD_VERSION "0.225"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.224" > $@ + @echo #define BARE_BUILD_VERSION "0.225" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ -- cgit v1.2.3