From 7b86f533b1eb39506820242b5ba426fe1209aa8b Mon Sep 17 00:00:00 2001 From: holub Date: Tue, 28 Jun 2022 11:01:10 -0400 Subject: Fixed regressions in spectrum clones: (#10000) * spec128.cpp: Avoid exception for clones that don't use inherited memory layout. * elwro800.cpp: Fixed crash on screen updates. --- src/mame/drivers/elwro800.cpp | 6 +++++- src/mame/drivers/spec128.cpp | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mame/drivers/elwro800.cpp b/src/mame/drivers/elwro800.cpp index 3f2ff68b0dd..2b2d3a59da2 100644 --- a/src/mame/drivers/elwro800.cpp +++ b/src/mame/drivers/elwro800.cpp @@ -520,6 +520,8 @@ INPUT_PORTS_END void elwro800_state::machine_reset() { + spectrum_state::machine_reset(); + uint8_t *messram = m_ram->pointer(); memset(messram, 0, 64*1024); @@ -575,7 +577,9 @@ void elwro800_state::elwro800(machine_config &config) /* video hardware */ screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER)); - screen.set_raw(14_MHz_XTAL / 2, 448, 0, SPEC_SCREEN_WIDTH, 312, 0, SPEC_SCREEN_HEIGHT); + rectangle visarea = { get_screen_area().left() - SPEC_LEFT_BORDER, get_screen_area().right() + SPEC_RIGHT_BORDER, + get_screen_area().top() - SPEC_TOP_BORDER, get_screen_area().bottom() + SPEC_BOTTOM_BORDER }; + screen.set_raw(14_MHz_XTAL / 2, SPEC_CYCLES_PER_LINE * 2, SPEC_UNSEEN_LINES + SPEC_SCREEN_HEIGHT, visarea); // Sync and interrupt timings determined by 2716 EPROM screen.set_screen_update(FUNC(elwro800_state::screen_update_spectrum)); screen.set_palette("palette"); diff --git a/src/mame/drivers/spec128.cpp b/src/mame/drivers/spec128.cpp index c1ab6e53476..5c7dc56a429 100644 --- a/src/mame/drivers/spec128.cpp +++ b/src/mame/drivers/spec128.cpp @@ -298,10 +298,11 @@ void spectrum_128_state::machine_start() memory_region *rom = memregion("maincpu"); m_bank_rom[0]->configure_entries(0, 2, rom->base() + 0x10000, 0x4000); + auto ram_entries = m_ram->size() / 0x4000; for (auto i = 1; i < 4; i++) - m_bank_ram[i]->configure_entries(0, m_ram->size() / 0x4000, m_ram->pointer(), 0x4000); + m_bank_ram[i]->configure_entries(0, ram_entries, m_ram->pointer(), 0x4000); - m_bank_ram[1]->set_entry(5); /* Bank 5 is always in 0x4000 - 0x7fff */ + m_bank_ram[1]->set_entry(ram_entries > 5 ? 5 : (ram_entries - 1)); /* Bank 5 is always in 0x4000 - 0x7fff */ m_bank_ram[2]->set_entry(2); /* Bank 2 is always in 0x8000 - 0xbfff */ } -- cgit v1.2.3 From 4d59eafa4f45eb788f366435c6ccf80dfb3b3ba8 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 29 Jun 2022 07:59:22 +1000 Subject: vgmplay.xml: Lowercase on a Japanese particle in a description. --- hash/vgmplay.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash/vgmplay.xml b/hash/vgmplay.xml index 9d7fc7f14f7..03246fd7fac 100644 --- a/hash/vgmplay.xml +++ b/hash/vgmplay.xml @@ -298159,7 +298159,7 @@ license:CC0 - Quiz Gakumon No Susume (Arcade) + Quiz Gakumon no Susume (Arcade) 1993 Konami -- cgit v1.2.3 From 03c2563b5925f50c8a80a96da605953d93699e49 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 30 Jun 2022 00:35:35 +1000 Subject: Bump version to 0.245 --- 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 44ddf5f06ef..dea907bcd31 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 916d92277f4..656be921574 100644 --- a/makefile +++ b/makefile @@ -1546,7 +1546,7 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.244"' > $@ + @echo '#define BARE_BUILD_VERSION "0.245"' > $@ @echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char bare_vcs_revision[];' >> $@ @@ -1556,7 +1556,7 @@ $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) @echo 'const char build_version[] = BARE_BUILD_VERSION " (" BARE_VCS_REVISION ")";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.244" > $@ + @echo #define BARE_BUILD_VERSION "0.245" > $@ @echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char bare_vcs_revision[]; >> $@ -- cgit v1.2.3 From 5d31f0fc97a61920fe1bac50016fe137595c6590 Mon Sep 17 00:00:00 2001 From: BraiNKilleRGR Date: Wed, 29 Jun 2022 19:17:11 +0300 Subject: Fixes to Greek Translation Some minor fixes and missed the auto translated "Driver -> System" since in Greek changed the gender and so the article as well. (Driver=Male, System=Neutral ). Check the other translations as well in case something similar happened. --- language/Greek/strings.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/language/Greek/strings.po b/language/Greek/strings.po index 79426240b5e..9fe20c63a19 100644 --- a/language/Greek/strings.po +++ b/language/Greek/strings.po @@ -3113,12 +3113,12 @@ msgstr "Υποστηρίζεται: Ναι" #: src/frontend/mame/ui/selmenu.cpp:681 msgid "System is parent" -msgstr "Ο Σύστημα είναι γονικός" +msgstr "Το σύστημα είναι γονικό" #: src/frontend/mame/ui/selmenu.cpp:683 src/frontend/mame/ui/selmenu.cpp:685 #, c-format msgid "System is clone of: %1$s" -msgstr "Ο Σύστημα είναι κλώνος του: %1$s" +msgstr "Το σύστημα είναι κλώνος του: %1$s" #: src/frontend/mame/ui/selmenu.cpp:721 #, c-format @@ -3189,7 +3189,7 @@ msgstr "Γενικές Πληροφορίες" #: src/frontend/mame/ui/selmenu.cpp:2864 #, c-format msgid "Short Name\t%1$s\n" -msgstr "Μικρό Όνομα\t%1$s" +msgstr "Μικρό Όνομα\t%1$s\n" #: src/frontend/mame/ui/selmenu.cpp:2865 #, c-format @@ -3204,11 +3204,11 @@ msgstr "Κατασκευαστής\t%1$s\n" #: src/frontend/mame/ui/selmenu.cpp:2873 #, c-format msgid "System is Clone of\t%1$s\n" -msgstr "Ο Σύστημα είναι Κλώνος του\t%1$s\n" +msgstr "Το σύστημα είναι Κλώνος του\t%1$s\n" #: src/frontend/mame/ui/selmenu.cpp:2878 msgid "System is Parent\t\n" -msgstr "Ο Σύστημα είναι Γονικός\t\n" +msgstr "Το σύστημα είναι Γονικό\t\n" #: src/frontend/mame/ui/selmenu.cpp:2882 msgid "Analog Controls\tYes\n" @@ -3404,11 +3404,11 @@ msgstr "Χρονισμός\tΑτελής\n" #: src/frontend/mame/ui/selmenu.cpp:2998 msgid "Mechanical System\tYes\n" -msgstr "Μηχανικό Σύστημα\tΝαι" +msgstr "Μηχανικό Σύστημα\tΝαι\n" #: src/frontend/mame/ui/selmenu.cpp:2998 msgid "Mechanical System\tNo\n" -msgstr "Μηχανικό Σύστημα\tΌχι" +msgstr "Μηχανικό Σύστημα\tΌχι\n" #: src/frontend/mame/ui/selmenu.cpp:2999 msgid "Requires Artwork\tYes\n" @@ -3432,11 +3432,11 @@ msgstr "Υποστήριξη Κοκτέιλ\tΌχι\n" #: src/frontend/mame/ui/selmenu.cpp:3003 msgid "System is BIOS\tYes\n" -msgstr "Ο σύστημα είναι BIOS\tΝαι\n" +msgstr "Το σύστημα είναι BIOS\tΝαι\n" #: src/frontend/mame/ui/selmenu.cpp:3003 msgid "System is BIOS\tNo\n" -msgstr "Ο σύστημα είναι BIOS\tΌχι\n" +msgstr "Το σύστημα είναι BIOS\tΌχι\n" #: src/frontend/mame/ui/selmenu.cpp:3004 msgid "Support Save\tYes\n" -- cgit v1.2.3