[Scummvm-git-logs] scummvm master -> 0084aad82328d88b98f9bcaeed9893512411796a

[dreammaster]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
327e749486 Revert "NUVIE: Improve cursor responsiveness of main menu"
0084aad823 NUVIE: Fix input lag in Ultima 6 main menu


Commit: 327e749486372e4cfbe3597e81d52c2c167075db
    https://github.com/scummvm/scummvm/commit/327e749486372e4cfbe3597e81d52c2c167075db
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-03-13T20:41:58-07:00

Commit Message:
Revert "NUVIE: Improve cursor responsiveness of main menu"

This reverts commit 518247c39a508101f2a81ccdd979183686cfa93b.
The commit did not fix main menu input lag.

Changed paths:
    devtools/create_ultima/files/ultima6/scripts/u6/intro.lua


diff --git a/devtools/create_ultima/files/ultima6/scripts/u6/intro.lua b/devtools/create_ultima/files/ultima6/scripts/u6/intro.lua
index 61d9545a91a..893fb79fd74 100644
--- a/devtools/create_ultima/files/ultima6/scripts/u6/intro.lua
+++ b/devtools/create_ultima/files/ultima6/scripts/u6/intro.lua
@@ -3052,7 +3052,6 @@ local function main_menu()
 	g_menu["title"].visible = true
 	g_menu["subtitle"].visible = true
 	g_menu["menu"].visible = true
-	canvas_set_update_interval(10)
 
 	local input
 
@@ -3065,8 +3064,6 @@ local function main_menu()
 		end
 
 		if input ~= nil then
-			canvas_set_update_interval(25)
-
 			if input == 113 then     --q quit
 				return "Q"
 			elseif input == 105 or input == 13 and g_menu_idx == 0 then --i
@@ -3160,9 +3157,7 @@ local function main_menu()
 					end
 				end
 			end
-
 			input = nil
-			canvas_set_update_interval(10)
 		end
 	end
 end


Commit: 0084aad82328d88b98f9bcaeed9893512411796a
    https://github.com/scummvm/scummvm/commit/0084aad82328d88b98f9bcaeed9893512411796a
Author: PushmePullyu (127053144+PushmePullyu at users.noreply.github.com)
Date: 2023-03-13T20:41:58-07:00

Commit Message:
NUVIE: Fix input lag in Ultima 6 main menu

Make sure all queued events are handled between calls to
canvas_update(). Decouples event polling rate from screen update rate.

Fixes #11478 and #12697

Changed paths:
    devtools/create_ultima/files/ultima6/scripts/u6/intro.lua


diff --git a/devtools/create_ultima/files/ultima6/scripts/u6/intro.lua b/devtools/create_ultima/files/ultima6/scripts/u6/intro.lua
index 893fb79fd74..5b280edb228 100644
--- a/devtools/create_ultima/files/ultima6/scripts/u6/intro.lua
+++ b/devtools/create_ultima/files/ultima6/scripts/u6/intro.lua
@@ -3057,14 +3057,16 @@ local function main_menu()
 
 	while true do
 		canvas_update()
-		input = input_poll(true)
 
 		if engine_should_quit() == 1 then
 			return "Q"
 		end
 
-		if input ~= nil then
-			if input == 113 then     --q quit
+		while true do
+			input = input_poll(true)
+			if input == nil then
+				break
+			elseif input == 113 then     --q quit
 				return "Q"
 			elseif input == 105 or input == 13 and g_menu_idx == 0 then --i
 				selected_intro()
@@ -3157,7 +3159,6 @@ local function main_menu()
 					end
 				end
 			end
-			input = nil
 		end
 	end
 end