diff --git a/binaries/data/mods/public/gui/common/functions_global_object.js b/binaries/data/mods/public/gui/common/functions_global_object.js index 3ae423257f..ee8ba4c107 100644 --- a/binaries/data/mods/public/gui/common/functions_global_object.js +++ b/binaries/data/mods/public/gui/common/functions_global_object.js @@ -122,6 +122,27 @@ function displayGamestateNotifications() setTimeout(displayGamestateNotifications, 1000); } +/** + * This function is called from the engine whenever starting a game fails. + */ +function cancelOnLoadGameError(msg) +{ + Engine.EndGame(); + + Engine.SwitchGuiPage("page_pregame.xml"); + + if (msg) + Engine.PushGuiPage("page_msgbox.xml", { + "width": 500, + "height": 200, + "message": '[font="sans-bold-18"]' + msg + '[/font]', + "title": translate("Loading Aborted"), + "mode": 2 + }); + + Engine.ResetCursor(); +} + /** * Also called from the C++ side when ending the game. * The current page can be the summary screen or a message box, so it can't be moved to session/. diff --git a/binaries/data/mods/public/gui/common/functions_utility_error.js b/binaries/data/mods/public/gui/common/functions_utility_error.js deleted file mode 100644 index 856518f3be..0000000000 --- a/binaries/data/mods/public/gui/common/functions_utility_error.js +++ /dev/null @@ -1,17 +0,0 @@ -function cancelOnError(msg) -{ - Engine.EndGame(); - - Engine.SwitchGuiPage("page_pregame.xml"); - - if (msg) - Engine.PushGuiPage("page_msgbox.xml", { - "width": 500, - "height": 200, - "message": '[font="sans-bold-18"]' + msg + '[/font]', - "title": translate("Loading Aborted"), - "mode": 2 - }); - - Engine.ResetCursor(); -} diff --git a/binaries/data/mods/public/gui/loading/loading.xml b/binaries/data/mods/public/gui/loading/loading.xml index 696dad5800..a8c532e750 100644 --- a/binaries/data/mods/public/gui/loading/loading.xml +++ b/binaries/data/mods/public/gui/loading/loading.xml @@ -8,7 +8,6 @@