[Scummvm-git-logs] scummvm master -> a566bf5eea79e5bde983ebd2e368a93137df3515

[dreammaster]

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

Summary:
a566bf5eea ULTIMA6: Update main menu scripts for World of Ultima games


Commit: a566bf5eea79e5bde983ebd2e368a93137df3515
    https://github.com/scummvm/scummvm/commit/a566bf5eea79e5bde983ebd2e368a93137df3515
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-09-05T15:46:12-07:00

Commit Message:
ULTIMA6: Update main menu scripts for World of Ultima games

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


diff --git a/devtools/create_ultima/files/ultima6/scripts/md/intro.lua b/devtools/create_ultima/files/ultima6/scripts/md/intro.lua
index 9bb2b406c9..2f95c44192 100644
--- a/devtools/create_ultima/files/ultima6/scripts/md/intro.lua
+++ b/devtools/create_ultima/files/ultima6/scripts/md/intro.lua
@@ -1962,11 +1962,19 @@ function main_menu()
 
    g_menu_cursor_sprite = sprite_new(g_img_tbl[0][2], 26, 0, true)
    update_menu_cursor()
+   canvas_set_update_interval(10)
 
    while true do
       canvas_update()
       local input = input_poll(true)
+
+      if engine_should_quit() == 1 then
+         return "Q"
+      end
+
       if input ~= nil then
+         canvas_set_update_interval(25)
+
          if input == SDLK_q then -- q
             return "Q"
          elseif input == SDLK_RETURN or input == SDLK_SPACE or input == KP_ENTER then -- space or return
@@ -2009,6 +2017,8 @@ function main_menu()
                end
             end
          end
+
+         canvas_set_update_interval(10)
       end
    end
 
diff --git a/devtools/create_ultima/files/ultima6/scripts/se/intro.lua b/devtools/create_ultima/files/ultima6/scripts/se/intro.lua
index 4c8360195b..6f836f0b23 100644
--- a/devtools/create_ultima/files/ultima6/scripts/se/intro.lua
+++ b/devtools/create_ultima/files/ultima6/scripts/se/intro.lua
@@ -1007,11 +1007,19 @@ local function main_menu(img_tbl2)
 	local seTitle = sprite_new(img_tbl2[0][0], 0, 0, true)
 	mouse_cursor_visible(true)
 	initialize_main_g_menu_sprites(img_tbl2)
+   canvas_set_update_interval(10)
 
 	while true do
 		canvas_update()
 		input = input_poll(true)
+
+		if engine_should_quit() == 1 then
+			return "Q"
+		end
+
 		if input ~= nil then
+			canvas_set_update_interval(25)
+
 			if input == SDLK_q then -- q
 				return "Q"
 			elseif input == SDLK_RETURN or input == SDLK_SPACE or input == KP_ENTER then -- space or return
@@ -1087,6 +1095,8 @@ local function main_menu(img_tbl2)
 					set_main_menu_highlight()
 				end
 			end
+
+			canvas_set_update_interval(10)
 		end
 	end
 --[[		This code should never execute because there is no break in the loop