Merge tag 'mame0271' into HEAD

MAME 0.271
mamedev · Oct 31, 2024 · 9c32c75 · 9c32c75
2 parents 1bc5803 + 4da96a0
commit 9c32c75
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 19 deletions.
diff --git 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="270"
-      android:versionName="0.270"
+      android:versionCode="271"
+      android:versionName="0.271"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.270'
+version = '0.271'
 # The full version, including alpha/beta/rc tags.
-release = '0.270'
+release = '0.271'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/hash/nes.xml b/hash/nes.xml
@@ -8499,26 +8499,17 @@ license:CC0-1.0
 		</part>
 	</software>
 
-	<!-- dgolf version 1.4TE rebuilt from Git using cc65 commit
-	     80a43d732dc9551ad84343ea9644d8fab7ec0bd9.  Byte-identical copies of 1.5 and
-	     1.0-1.4 have been reproduced with this toolchain, giving high confidence that the
-	     rebuilds are the same as what was released.  Without existent online copies,
-	     however, this cannot be verified.
-	-->
 	<software name="dgolf14te" cloneof="dgolf">
 		<description>NESert Golfing Tournament Edition (v1.4)</description>
 		<year>2019</year>
 		<publisher>rainwarrior</publisher>
-		<notes><![CDATA[
-		An original download should be located to verify and/or update the hash.
-		]]></notes>
-		<info name="release" value="20191124" /> <!-- From NESertGolfing Git tag -->
+		<info name="release" value="20191124" /> <!-- From NESertGolfing Git tag, apparently released earlier than this as downloads as early as 2019-11-10 exist -->
 		<part name="cart" interface="nes_cart">
 			<feature name="slot" value="uxrom" />
 			<feature name="pcb" value="NES-UNROM" />
 			<feature name="mirroring" value="vertical" />
 			<dataarea name="prg" size="32768">
-				<rom name="dgolf_te prg" size="32768" crc="3ec19565" sha1="24c243f3edd8f1ba9c7f55ef45a1b4110e68ba1a" status="baddump" />
+				<rom name="dgolf_te prg" size="32768" crc="3ec19565" sha1="24c243f3edd8f1ba9c7f55ef45a1b4110e68ba1a" />
 			</dataarea>
 			<!-- 8k VRAM on cartridge -->
 			<dataarea name="vram" size="8192" />

diff --git a/makefile b/makefile
@@ -1578,7 +1578,7 @@ endif
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.270"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.271"' > $@
 	@echo '#define BARE_VCS_REVISION "$(NEW_GIT_VERSION)"' >> $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char bare_vcs_revision[];' >> $@
@@ -1588,7 +1588,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.270" > $@
+	@echo #define BARE_BUILD_VERSION "0.271" > $@
 	@echo #define BARE_VCS_REVISION "$(NEW_GIT_VERSION)" >> $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char bare_vcs_revision[]; >> $@

diff --git a/src/frontend/mame/ui/menu.cpp b/src/frontend/mame/ui/menu.cpp
@@ -1177,13 +1177,14 @@ std::pair<int, bool> menu::handle_pointer_update(uint32_t flags, ui_event const
 	// give derived class a chance to handle it
 	if ((track_pointer::IDLE == m_pointer_state) || (track_pointer::CUSTOM == m_pointer_state))
 	{
+		bool const wascustom(track_pointer::CUSTOM == m_pointer_state);
 		auto const [key, take, redraw] = custom_pointer_updated(changed, uievt);
 		if (take)
 		{
 			m_pointer_state = track_pointer::CUSTOM;
 			return std::make_pair(key, redraw);
 		}
-		else if (track_pointer::CUSTOM == m_pointer_state)
+		else if (wascustom)
 		{
 			if (uievt.pointer_buttons)
 			{

diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp
@@ -1733,7 +1733,7 @@ bool menu_select_launch::handle_events(u32 flags, event &ev)
 
 		// text input goes to the search field unless there's an error message displayed
 		case ui_event::type::IME_CHAR:
-			if (!pointer_idle())
+			if (have_pointer() && !pointer_idle())
 				break;
 
 			if (exclusive_input_pressed(ev.iptkey, IPT_UI_FOCUS_NEXT, 0) || exclusive_input_pressed(ev.iptkey, IPT_UI_FOCUS_PREV, 0))