mirror of
https://github.com/holub/mame
synced 2025-04-16 05:24:54 +03:00
MAME 0.245
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE0DYtsBhE4EM627+6wXSxAYxAcQ4FAmK8f04ACgkQwXSxAYxA cQ5iPw/+NS4HdXC/eYKflAMTJXxrvMFr6YoPSRsCwh6jkIPEBusB+136XqcKIpqH 9V5+O5aucw3uaWNXhU0SszjIanC4HftEeo/udgtP0cgUpE4/XMLIT2GWr55BbrgS YgFHpz9KfwLM03lkJlgVSFUTD6D0a+jNlionMZn1mEY/GKPfO30H5pjWyZOkrGaT fTyo8FQG9UFPtOBpX0dZgsd42xHSJ/NyYRwudFZMC2zSnc2hqDEn3s2w28dPjsUv hO+FN7EzWxPkkwasEuOitXJyeA0rRiSJZB9EXPZwCdriVU3+vHxNRv1fCr7YE8JR pdo58JWUb7MPsw0J92aOv7rKzMD2R3IFT5VLUymKpR65jsCb4LN5QL9OIVZ0jyhp H+ighcgSZjLeBUKJ7lvDrGKpaxaGwD4OIGFmSvPh+laT/bAnFNa7e4x0Tc+fV9Rn 3zxDAaaTRb3XkghfEOvNwL4XIiSb0Y2lVS6xNVMRMn5l3xtvaFWECJTwHHIDbG6r IUxR3i6EKbasJ4iwtWnTPLcJEVQm7iCIEtCRBmyU8EsF7U9rnYOxXh5fQ4N2z9sd iJCxtVt4/J7BDtJDOYD03V03D9LiBQ07hqlB//QXr9m1PRKr/GqvJ8XVtbXvCfk2 ekjQoVmHAuVXxEP0CnvRa/RylBPLHbTmAdVHnVGT61s0eXuhnb4= =/FsK -----END PGP SIGNATURE----- Merge tag 'mame0245' into mainline-master MAME 0.245
This commit is contained in:
commit
b3ce12d0c0
@ -4,8 +4,8 @@
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.mamedev.mame"
|
||||
android:versionCode="244"
|
||||
android:versionName="0.244"
|
||||
android:versionCode="245"
|
||||
android:versionName="0.245"
|
||||
android:installLocation="auto">
|
||||
|
||||
<!-- OpenGL ES 2.0 -->
|
||||
|
@ -298159,7 +298159,7 @@ license:CC0
|
||||
</software>
|
||||
|
||||
<software name="qgakumon">
|
||||
<description>Quiz Gakumon No Susume (Arcade)</description>
|
||||
<description>Quiz Gakumon no Susume (Arcade)</description>
|
||||
<year>1993</year>
|
||||
<publisher>Konami</publisher>
|
||||
<info name="cores" value="YM2151, K053260"/>
|
||||
|
@ -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"
|
||||
|
4
makefile
4
makefile
@ -1552,7 +1552,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[];' >> $@
|
||||
@ -1562,7 +1562,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[]; >> $@
|
||||
|
@ -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");
|
||||
|
@ -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 */
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user