From 2f2e5f9aa7c5775cbd8e3c0af6ebbe6140ecde42 Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Sun, 7 Aug 2022 18:03:23 +0900
Subject: [PATCH] Skip 400ms delay after opening menu if mouse movement is
 disabled

This removes the 400ms delay in NACT::wait_after_open_menu() if
automatic mouse movement is disabled, because there's less risk of
miss-clicking.
---
 src/android/nact_android.cpp       |  1 +
 src/emscripten/nact_emscripten.cpp |  1 +
 src/sys/nact.cpp                   | 23 ++++++++++-------------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/android/nact_android.cpp b/src/android/nact_android.cpp
index 2f29483..13576b9 100644
--- a/src/android/nact_android.cpp
+++ b/src/android/nact_android.cpp
@@ -31,6 +31,7 @@ void NACT::text_dialog()
 
 void NACT::platform_initialize()
 {
+	mouse_move_enabled = false;
 }
 
 void NACT::platform_finalize()
diff --git a/src/emscripten/nact_emscripten.cpp b/src/emscripten/nact_emscripten.cpp
index 0687e7c..8ce9e0f 100644
--- a/src/emscripten/nact_emscripten.cpp
+++ b/src/emscripten/nact_emscripten.cpp
@@ -38,6 +38,7 @@ void NACT::text_dialog()
 
 void NACT::platform_initialize()
 {
+	mouse_move_enabled = false;
 	if (custom_event_type == static_cast<Uint32>(-1)) {
 		custom_event_type = SDL_RegisterEvents(1);
 		EM_ASM({ setInterval(() => _msgskip_syncFile(), 5000); });
diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp
index d79cf27..4d1a139 100644
--- a/src/sys/nact.cpp
+++ b/src/sys/nact.cpp
@@ -504,21 +504,18 @@ uint16 NACT::random(uint16 range)
 
 void NACT::wait_after_open_menu()
 {
-	// 連打による誤クリック防止
-	Uint32 dwTime = SDL_GetTicks();
-	Uint32 dwWait = dwTime + 400;
+	if (mouse_move_enabled) {
+		// 連打による誤クリック防止
+		Uint32 dwTime = SDL_GetTicks();
+		Uint32 dwWait = dwTime + 400;
 
-	while(dwTime < dwWait) {
-		if(terminate) {
-			return;
+		while(dwTime < dwWait) {
+			if(terminate) {
+				return;
+			}
+			sys_sleep(10);
+			dwTime = SDL_GetTicks();
 		}
-/*
-		if(get_key() == 16) {
-			break;
-		}
-*/
-		sys_sleep(10);
-		dwTime = SDL_GetTicks();
 	}
 
 	// クリック中の間は待機