From 6ea6d76d5aa5b31c59bf4d46fa61120733814cd7 Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 24 Mar 2018 16:29:15 -0400 Subject: std::move is required here, unfortunately (nw) --- src/devices/cpu/sparc/mb86901.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/cpu/sparc/mb86901.cpp b/src/devices/cpu/sparc/mb86901.cpp index e40d551dc94..fa226356bb2 100644 --- a/src/devices/cpu/sparc/mb86901.cpp +++ b/src/devices/cpu/sparc/mb86901.cpp @@ -527,7 +527,7 @@ std::unique_ptr mb86901_device::create_disassembler() { auto dasm = std::make_unique(static_cast(this), 7); m_asi_desc_adder(dasm.get()); - return dasm; + return std::move(dasm); } -- cgit v1.2.3 From 6a7467d57a3b2e5fc18c06303f28aafeb086dfae Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 26 Mar 2018 00:53:47 -0400 Subject: Fix for MT 06921 (nw) --- src/mame/drivers/vigilant.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 82047b93ee3..3f86702999c 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -493,6 +493,8 @@ MACHINE_CONFIG_START(vigilant_state::vigilant) MCFG_CPU_IO_MAP(sound_io_map) MCFG_CPU_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */ /* IRQs are generated by main Z80 and YM2151 */ + MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb) + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(55) @@ -541,6 +543,8 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs) MCFG_CPU_IO_MAP(buccanrs_sound_io_map) MCFG_CPU_PERIODIC_INT_DRIVER(vigilant_state, nmi_line_pulse, 128*55) /* clocked by V1 */ /* IRQs are generated by main Z80 and YM2151 */ + MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("soundirq", rst_neg_buffer_device, inta_cb) + /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(55) @@ -558,7 +562,7 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) + MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w)) MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0) @@ -567,7 +571,7 @@ MACHINE_CONFIG_START(vigilant_state::buccanrs) MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0) MCFG_SOUND_ADD("ym1", YM2203, 18432000/6) - MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst30_w)) + MCFG_YM2203_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.35) MCFG_SOUND_ROUTE(0, "rspeaker", 0.35) MCFG_SOUND_ROUTE(1, "lspeaker", 0.35) @@ -624,7 +628,7 @@ MACHINE_CONFIG_START(vigilant_state::kikcubic) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) + MCFG_GENERIC_LATCH_DATA_PENDING_CB(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst18_w)) MCFG_GENERIC_LATCH_SEPARATE_ACKNOWLEDGE(true) MCFG_DEVICE_ADD("soundirq", RST_NEG_BUFFER, 0) @@ -633,7 +637,7 @@ MACHINE_CONFIG_START(vigilant_state::kikcubic) MCFG_SOUND_ADD("m72", IREM_M72_AUDIO, 0) MCFG_YM2151_ADD("ymsnd", 3579645) - MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst30_w)) + MCFG_YM2151_IRQ_HANDLER(DEVWRITELINE("soundirq", rst_neg_buffer_device, rst28_w)) MCFG_SOUND_ROUTE(0, "lspeaker", 0.55) MCFG_SOUND_ROUTE(1, "rspeaker", 0.55) -- cgit v1.2.3 From 62f6afa153582020f1cb9ee58c4c52dc9ed7e4cd Mon Sep 17 00:00:00 2001 From: ClawGrip Date: Mon, 26 Mar 2018 23:58:06 +0200 Subject: Regional game names fixes (Spanish special characters) Checked against emu and with original cart on real hardware --- hash/gameboy.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hash/gameboy.xml b/hash/gameboy.xml index 5fd22294132..006bebbdd38 100644 --- a/hash/gameboy.xml +++ b/hash/gameboy.xml @@ -16925,7 +16925,7 @@ - Pokémon - Edicion Amarilla (Spa) + Pokémon - Edición Amarilla (Spa) 2000 Nintendo -- cgit v1.2.3 From 232447937a3e538db5b76d5408181cc8c37b7b2b Mon Sep 17 00:00:00 2001 From: aviloria Date: Mon, 26 Mar 2018 21:28:59 +0200 Subject: Update strings.po --- language/Spanish/strings.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po index cedcebe30c4..7d0f1a2fec7 100644 --- a/language/Spanish/strings.po +++ b/language/Spanish/strings.po @@ -3,7 +3,7 @@ # Copyright (C) 2016 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the MAME package. # Automatically generated, 2016. -# A. Viloria, 2016-2017. +# A. Viloria, 2016-2018. # Ismael Ferreras Morezuelas , 2016. # msgid "" @@ -1478,7 +1478,7 @@ msgstr "Guardado/recuperación automático/a" #: src/frontend/mame/ui/submenu.cpp:67 msgid "Rewind capacity" -msgstr "" +msgstr "Capacidad de rebobinado" #: src/frontend/mame/ui/submenu.cpp:68 msgid "Bilinear snapshot" @@ -2169,7 +2169,7 @@ msgstr "[crear]" #: src/frontend/mame/ui/filesel.cpp:419 #, c-format msgid "Error accessing %s" -msgstr "" +msgstr "Error al acceder a %s" #: src/frontend/mame/ui/filesel.cpp:515 msgid "Select access mode" @@ -2685,7 +2685,7 @@ msgstr "Guardar actual -- #" #: plugins/cheatfind/init.lua:536 #, lua-format msgid "%d total matches found" -msgstr "" +msgstr "%d coincidencias encontradas" #: plugins/cheatfind/init.lua:543 msgid "Compare" @@ -2806,21 +2806,21 @@ msgstr "Buscador de Trucos" #: plugins/portname/init.lua:67 msgid "Save input names to file" -msgstr "" +msgstr "Guardar los nombres de entrada a fichero" #: plugins/portname/init.lua:87 plugins/portname/init.lua:92 #: plugins/portname/init.lua:108 msgid "Failed to save input name file" -msgstr "" +msgstr "Error al guardar el fichero nombres de entrada" #: plugins/portname/init.lua:119 #, lua-format msgid "Input port name file saved to %s" -msgstr "" +msgstr "Fichero de nombres de puertos de entrada guardado en %s" #: plugins/portname/init.lua:124 msgid "Input ports" -msgstr "" +msgstr "Puertos de entrada" #~ msgid " total matches found" #~ msgstr " elementos encontrados" -- cgit v1.2.3 From dd392ba1092c02de036257b2c4a97f93fc71b91b Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 27 Mar 2018 10:13:55 +1100 Subject: Clean up crud (nw) --- language/Spanish/strings.po | 60 --------------------------------------------- 1 file changed, 60 deletions(-) diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po index 7d0f1a2fec7..fc55750c601 100644 --- a/language/Spanish/strings.po +++ b/language/Spanish/strings.po @@ -2822,9 +2822,6 @@ msgstr "Fichero de nombres de puertos de entrada guardado en %s" msgid "Input ports" msgstr "Puertos de entrada" -#~ msgid " total matches found" -#~ msgstr " elementos encontrados" - #~ msgid "" #~ "ROM Audit Disabled\t\n" #~ "Samples Audit Disabled\t\n" @@ -2832,39 +2829,6 @@ msgstr "Puertos de entrada" #~ "Auditoría de ROMs deshabilitada\t\n" #~ "Auditoría de muestras deshabilitada\t\n" -#~ msgid "Default name is " -#~ msgstr "El nombre por defecto es " - -#~ msgid "Mechanical Machine\t%1$s\n" -#~ msgstr "Máquina mecánica\t%1$s\n" - -#~ msgid "Requires Artwork\t%1$s\n" -#~ msgstr "Requiere arte\t%1$s\n" - -#~ msgid "Requires Clickable Artwork\t%1$s\n" -#~ msgstr "Requiere arte clicable\t%1$s\n" - -#~ msgid "Support Cocktail\t%1$s\n" -#~ msgstr "Soporta cóctel\t%1$s\n" - -#~ msgid "Driver is BIOS\t%1$s\n" -#~ msgstr "El controlador es una BIOS\t%1$s\n" - -#~ msgid "Support Save\t%1$s\n" -#~ msgstr "Permite guardar\t%1$s\n" - -#~ msgid "Screen Orientation\t%1$s\n" -#~ msgstr "Orientación de pantalla\t%1$s\n" - -#~ msgid "Vertical" -#~ msgstr "Vertical" - -#~ msgid "Horizontal" -#~ msgstr "Horizontal" - -#~ msgid "Requires CHD\t%1$s\n" -#~ msgstr "Requiere CHD\t%1$s\n" - #~ msgid "Roms Audit Pass\tOK\n" #~ msgstr "Auditoría de ROMs\tCORRECTA\n" @@ -2887,29 +2851,5 @@ msgstr "Puertos de entrada" #~ "Auditoría de ROMs\tDeshabilitada\n" #~ "Auditoría de las muestras\tDeshabilitada\n" -#~ msgid "Unimplemented" -#~ msgstr "No implementado" - -#~ msgid "Imperfect" -#~ msgstr "Imperfecto" - -#~ msgid "OK" -#~ msgstr "Aceptable" - #~ msgid "Gfx: %s, Sound: %s" #~ msgstr "Gráficos: %s, Sonido: %s" - -#~ msgid "Audit in progress..." -#~ msgstr "Auditando..." - -#~ msgid "Extra INIs" -#~ msgstr "INIs adicionales" - -#~ msgid " ^!File" -#~ msgstr " ^!Archivo" - -#~ msgid "Main filter" -#~ msgstr "Filtro principal" - -#~ msgid "Other filter" -#~ msgstr "Otros filtros" -- cgit v1.2.3 From 457fbed8f5d9e02a09a04db25a7700365358095b Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 27 Mar 2018 11:31:00 +1100 Subject: fix warning from 32-bit build (nw) --- src/mame/machine/cammu.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mame/machine/cammu.cpp b/src/mame/machine/cammu.cpp index 99f783f4128..17ac438931b 100644 --- a/src/mame/machine/cammu.cpp +++ b/src/mame/machine/cammu.cpp @@ -32,6 +32,8 @@ #include "emu.h" #include "cammu.h" +#include + #define LOG_GENERAL (1U << 0) #define LOG_ACCESS (1U << 1) #define LOG_DTU (1U << 2) @@ -219,8 +221,7 @@ void cammu_device::set_spaces(std::vector spaces) { assert_always(spaces.size() == 8, "exactly 8 address space pointers are required"); - for (int i = 0; i < spaces.size(); i++) - m_space[i] = spaces[i]; + std::copy(spaces.begin(), spaces.end(), std::begin(m_space)); } cammu_device::translated_t cammu_device::translate_address(const u32 ssw, const u32 virtual_address, const access_size size, const access_type mode) -- cgit v1.2.3 From edd932d78e74dd302f42ab81bd5662ee7ae592a2 Mon Sep 17 00:00:00 2001 From: Jos van Mourik Date: Tue, 27 Mar 2018 03:17:46 +0200 Subject: Update Dutch strings --- language/Dutch/strings.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/language/Dutch/strings.po b/language/Dutch/strings.po index ede76044158..8363b9a836a 100644 --- a/language/Dutch/strings.po +++ b/language/Dutch/strings.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: MAME\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-25 02:01+1100\n" -"PO-Revision-Date: 2018-01-29 21:03+0100\n" +"PO-Revision-Date: 2018-03-27 03:16+0200\n" "Last-Translator: Jos van Mourik\n" "Language-Team: MAME Language Team\n" "Language: nl\n" @@ -2681,7 +2681,7 @@ msgstr "Sla huidige -- # op" #: plugins/cheatfind/init.lua:536 #, lua-format msgid "%d total matches found" -msgstr "" +msgstr "%d totale overeenkomsten gevonden" #: plugins/cheatfind/init.lua:543 msgid "Compare" -- cgit v1.2.3 From e8f2016076bc1f3e4ee4de1475ad07ee09187bce Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 28 Mar 2018 01:21:46 +1100 Subject: version bump (nw) --- 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 f67e51b49a9..9ef896dc026 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 8e46e9133f2..41e0e299a2a 100644 --- a/makefile +++ b/makefile @@ -1566,14 +1566,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.195"' > $@ + @echo '#define BARE_BUILD_VERSION "0.196"' > $@ @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: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.195" > $@ + @echo #define BARE_BUILD_VERSION "0.196" > $@ @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