diff options
author | Vas Crabb <vas@vastheman.com> | 2018-03-28 12:01:01 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2018-03-28 12:01:01 +1100 |
commit | e70c9f99978570262cbaac33fed3518d393ce8e6 (patch) | |
tree | 3637b9ecab0af883077221a970ad61924a266e2c | |
parent | 010155a3c51aa80dcf736b52ec89ffd890f795ef (diff) | |
parent | e8f2016076bc1f3e4ee4de1475ad07ee09187bce (diff) |
Merge tag 'mame0196'
MAME 0.196
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | language/Spanish/strings.po | 60 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | src/mame/machine/cammu.cpp | 5 |
4 files changed, 7 insertions, 66 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 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mamedev.mame" - android:versionCode="195" - android:versionName="0.195" + android:versionCode="196" + android:versionName="0.196" android:installLocation="auto"> <!-- Android 5.0 --> 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" @@ -1571,14 +1571,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; >> $@ 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 <algorithm> + #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<address_space *> 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) |