summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2021-02-24 13:40:11 +1100
committer Vas Crabb <vas@vastheman.com>2021-02-24 13:40:11 +1100
commit805a333ebb6cf37fd48c1c3a6c951e084064a202 (patch)
tree3d749529efc2c5032565dd3c9b9b772319a650c3
parent6f429d7c22149daf039e43456b5685447db9d014 (diff)
parent4322eaae9d60a515c88cbc57a5536323e14f4e27 (diff)
Merge tag 'mame0229' into mainline-master
MAME 0.229
-rw-r--r--android-project/app/src/main/AndroidManifest.xml4
-rw-r--r--makefile4
-rw-r--r--src/mame/drivers/iez80.cpp2
-rw-r--r--src/mame/drivers/jpmimpctsw.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml
index 52aac8fe83e..a3e31808348 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="228"
- android:versionName="0.228"
+ android:versionCode="229"
+ android:versionName="0.229"
android:installLocation="auto">
<!-- OpenGL ES 2.0 -->
diff --git a/makefile b/makefile
index 2a5bf44cc77..0b97180cd4b 100644
--- a/makefile
+++ b/makefile
@@ -1745,14 +1745,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
- @echo '#define BARE_BUILD_VERSION "0.228"' > $@
+ @echo '#define BARE_BUILD_VERSION "0.229"' > $@
@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.228" > $@
+ @echo #define BARE_BUILD_VERSION "0.229" > $@
@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/drivers/iez80.cpp b/src/mame/drivers/iez80.cpp
index 511605e478a..091910c4509 100644
--- a/src/mame/drivers/iez80.cpp
+++ b/src/mame/drivers/iez80.cpp
@@ -229,4 +229,4 @@ ROM_END
//**************************************************************************
// YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS
-COMP( 1983, iez80, 0, 0, iez80, iez80, iez80_state, empty_init, "Insight Enterprises", "Z80 SBC (Prototype?)", MACHINE_IS_SKELETON )
+COMP( 1983, iez80, 0, 0, iez80, iez80, iez80_state, empty_init, "Insight Enterprises", "Z80 SBC (prototype?)", MACHINE_IS_SKELETON )
diff --git a/src/mame/drivers/jpmimpctsw.cpp b/src/mame/drivers/jpmimpctsw.cpp
index e99e7107d48..2535d9f5d91 100644
--- a/src/mame/drivers/jpmimpctsw.cpp
+++ b/src/mame/drivers/jpmimpctsw.cpp
@@ -11988,8 +11988,8 @@ GAME( 199?, j6sonich, j6sonic, impact_nonvideo, j6sonic, jpmimpct_state,
GAME( 199?, j6roof, 0, impact_nonvideo, j6roof, jpmimpct_state, empty_init, ROT0, "Ace", "Thru' The Roof (Ace) (IMPACT) (set 1)", GAME_FLAGS )
GAME( 199?, j6roofa, j6roof, impact_nonvideo, j6roof, jpmimpct_state, empty_init, ROT0, "Ace", "Thru' The Roof (Ace) (IMPACT) (set 2)", GAME_FLAGS )
-GAMEL( 199?, j6untch, 0, impact_nonvideo, j6untch, jpmimpct_state, empty_init, ROT0, "JPM", "Untouchable (JPM) (IMPACT) (UN3B LO6)", GAME_FLAGS_WORKING_NO_SOUND, layout_j6untch )
-GAMEL( 199?, j6untcha, j6untch, impact_nonvideo, j6untch, jpmimpct_state, empty_init, ROT0, "JPM", "Untouchable (JPM) (IMPACT) (UN3BI LO6)", GAME_FLAGS_WORKING_NO_SOUND, layout_j6untch )
+GAMEL( 199?, j6untch, 0, impact_nonvideo, j6untch, jpmimpct_state, empty_init, ROT0, "JPM", "Untouchable (JPM) (IMPACT) (UN3B LO6)", GAME_FLAGS, layout_j6untch )
+GAMEL( 199?, j6untcha, j6untch, impact_nonvideo, j6untch, jpmimpct_state, empty_init, ROT0, "JPM", "Untouchable (JPM) (IMPACT) (UN3BI LO6)", GAME_FLAGS, layout_j6untch )
// VFD issues, but VFD is likely unused as it calls the game 'Some Indeterminate Club Machine' with clear placeholder text
GAMEL( 199?, j6wldkng, 0, impact_nonvideo, j6wldkng, jpmimpct_state, empty_init, ROT0, "JPM", "Wild King Club (JPM) (IMPACT) (set 1)", GAME_FLAGS, layout_j6wldkng )