From 939d5436b0ab415aed19bd41c4fc4ac0962cdbd7 Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Fri, 25 Mar 2022 17:15:11 +0100 Subject: [PATCH] Retry tutorial join after 5 seconds --- data/languages/arabic.txt | 3 +++ data/languages/belarusian.txt | 3 +++ data/languages/bosnian.txt | 3 +++ data/languages/brazilian_portuguese.txt | 3 +++ data/languages/bulgarian.txt | 3 +++ data/languages/catalan.txt | 3 +++ data/languages/chuvash.txt | 3 +++ data/languages/czech.txt | 3 +++ data/languages/danish.txt | 3 +++ data/languages/dutch.txt | 3 +++ data/languages/finnish.txt | 3 +++ data/languages/french.txt | 3 +++ data/languages/german.txt | 3 +++ data/languages/greek.txt | 3 +++ data/languages/hungarian.txt | 3 +++ data/languages/italian.txt | 3 +++ data/languages/japanese.txt | 3 +++ data/languages/korean.txt | 4 +++- data/languages/kyrgyz.txt | 3 +++ data/languages/norwegian.txt | 3 +++ data/languages/persian.txt | 3 +++ data/languages/polish.txt | 3 +++ data/languages/portuguese.txt | 8 ++++++-- data/languages/romanian.txt | 3 +++ data/languages/russian.txt | 3 +++ data/languages/serbian.txt | 3 +++ data/languages/serbian_cyrillic.txt | 3 +++ data/languages/simplified_chinese.txt | 3 +++ data/languages/slovak.txt | 3 +++ data/languages/spanish.txt | 3 +++ data/languages/swedish.txt | 3 +++ data/languages/traditional_chinese.txt | 3 +++ data/languages/turkish.txt | 3 +++ data/languages/ukrainian.txt | 3 +++ src/game/client/components/menus_start.cpp | 19 ++++++++++++++++--- 35 files changed, 121 insertions(+), 6 deletions(-) diff --git a/data/languages/arabic.txt b/data/languages/arabic.txt index 4701ef682..0854b1d90 100644 --- a/data/languages/arabic.txt +++ b/data/languages/arabic.txt @@ -1344,3 +1344,6 @@ https://ddnet.tw/discord Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/belarusian.txt b/data/languages/belarusian.txt index 740857e4f..a73e8151f 100644 --- a/data/languages/belarusian.txt +++ b/data/languages/belarusian.txt @@ -1264,6 +1264,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt index d335ad997..33243b48f 100644 --- a/data/languages/bosnian.txt +++ b/data/languages/bosnian.txt @@ -1309,6 +1309,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/brazilian_portuguese.txt b/data/languages/brazilian_portuguese.txt index b7e4ad15a..3c20975c4 100644 --- a/data/languages/brazilian_portuguese.txt +++ b/data/languages/brazilian_portuguese.txt @@ -1364,3 +1364,6 @@ Chat command (e.g. showall 1) Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/bulgarian.txt b/data/languages/bulgarian.txt index bddd1373f..dd07b770c 100644 --- a/data/languages/bulgarian.txt +++ b/data/languages/bulgarian.txt @@ -1264,6 +1264,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/catalan.txt b/data/languages/catalan.txt index 01b3224e8..daa799145 100644 --- a/data/languages/catalan.txt +++ b/data/languages/catalan.txt @@ -1341,3 +1341,6 @@ Chat command (e.g. showall 1) Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/chuvash.txt b/data/languages/chuvash.txt index c1b3a88e3..213e88bbf 100644 --- a/data/languages/chuvash.txt +++ b/data/languages/chuvash.txt @@ -1264,6 +1264,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/czech.txt b/data/languages/czech.txt index 31b35eead..7a777ee0e 100644 --- a/data/languages/czech.txt +++ b/data/languages/czech.txt @@ -1351,3 +1351,6 @@ https://ddnet.tw/discord Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/danish.txt b/data/languages/danish.txt index e888783e5..7e225b84b 100644 --- a/data/languages/danish.txt +++ b/data/languages/danish.txt @@ -1349,3 +1349,6 @@ https://ddnet.tw/discord Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt index 8911503bd..b558408af 100644 --- a/data/languages/dutch.txt +++ b/data/languages/dutch.txt @@ -1332,6 +1332,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt index e7f62e09b..1267adb83 100644 --- a/data/languages/finnish.txt +++ b/data/languages/finnish.txt @@ -1337,6 +1337,9 @@ Assets directory Tutorial == +Can't find a Tutorial server +== + Server executable not found, can't run server == diff --git a/data/languages/french.txt b/data/languages/french.txt index 7effea305..f85043bdc 100644 --- a/data/languages/french.txt +++ b/data/languages/french.txt @@ -1377,3 +1377,6 @@ auto Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/german.txt b/data/languages/german.txt index 4c8c47227..a31bc9da2 100644 --- a/data/languages/german.txt +++ b/data/languages/german.txt @@ -1363,3 +1363,6 @@ auto Tutorial == Tutorial + +Can't find a Tutorial server +== Tutorial-Server kann nicht gefunden werden diff --git a/data/languages/greek.txt b/data/languages/greek.txt index 2a1f2c1dc..8d85a7bd8 100644 --- a/data/languages/greek.txt +++ b/data/languages/greek.txt @@ -1264,6 +1264,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/hungarian.txt b/data/languages/hungarian.txt index 37a938551..280045edc 100644 --- a/data/languages/hungarian.txt +++ b/data/languages/hungarian.txt @@ -1348,3 +1348,6 @@ auto Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/italian.txt b/data/languages/italian.txt index 4bec2bfef..92f71fdf7 100644 --- a/data/languages/italian.txt +++ b/data/languages/italian.txt @@ -1383,5 +1383,8 @@ https://ddnet.tw/discord Tutorial == +Can't find a Tutorial server +== + FPM == diff --git a/data/languages/japanese.txt b/data/languages/japanese.txt index 8749d2ad7..e0ec8da14 100644 --- a/data/languages/japanese.txt +++ b/data/languages/japanese.txt @@ -1348,3 +1348,6 @@ Chat command (e.g. showall 1) Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/korean.txt b/data/languages/korean.txt index 8a7f00f03..ef33bb1bf 100644 --- a/data/languages/korean.txt +++ b/data/languages/korean.txt @@ -1349,4 +1349,6 @@ auto == 자동 Tutorial -== 튜토리얼 \ No newline at end of file +== 튜토리얼 +Can't find a Tutorial server +== diff --git a/data/languages/kyrgyz.txt b/data/languages/kyrgyz.txt index 87b0b5139..77bd5cd21 100644 --- a/data/languages/kyrgyz.txt +++ b/data/languages/kyrgyz.txt @@ -1255,6 +1255,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/norwegian.txt b/data/languages/norwegian.txt index bba285ce4..17b18af7a 100644 --- a/data/languages/norwegian.txt +++ b/data/languages/norwegian.txt @@ -1350,3 +1350,6 @@ https://ddnet.tw/discord Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/persian.txt b/data/languages/persian.txt index 6785fecaa..fb162d3b5 100644 --- a/data/languages/persian.txt +++ b/data/languages/persian.txt @@ -1187,6 +1187,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Server executable not found, can't run server == diff --git a/data/languages/polish.txt b/data/languages/polish.txt index 0e33a4232..8a414f6f0 100644 --- a/data/languages/polish.txt +++ b/data/languages/polish.txt @@ -1351,3 +1351,6 @@ https://ddnet.tw/discord Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt index ff7a20012..2968f944a 100644 --- a/data/languages/portuguese.txt +++ b/data/languages/portuguese.txt @@ -985,8 +985,6 @@ Editor == Editor [Start menu] -9+ new mentions -== 9+ novas menções Successfully saved the replay! == @@ -1297,6 +1295,9 @@ Assets directory Tutorial == +Can't find a Tutorial server +== + Run server == @@ -1351,3 +1352,6 @@ Grabs %d new mentions == + +9+ new mentions +== diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt index c8b53d2e0..32e8d34b4 100644 --- a/data/languages/romanian.txt +++ b/data/languages/romanian.txt @@ -1270,6 +1270,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/russian.txt b/data/languages/russian.txt index e3ca75cd6..95cdf5d58 100644 --- a/data/languages/russian.txt +++ b/data/languages/russian.txt @@ -1356,3 +1356,6 @@ Chat command (e.g. showall 1) Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt index 026123c9b..c5c6e0d27 100644 --- a/data/languages/serbian.txt +++ b/data/languages/serbian.txt @@ -1265,6 +1265,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/serbian_cyrillic.txt b/data/languages/serbian_cyrillic.txt index a0cee0497..591fe4784 100644 --- a/data/languages/serbian_cyrillic.txt +++ b/data/languages/serbian_cyrillic.txt @@ -1348,3 +1348,6 @@ https://ddnet.tw/discord Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/simplified_chinese.txt b/data/languages/simplified_chinese.txt index 910a0c7ac..96d862afe 100644 --- a/data/languages/simplified_chinese.txt +++ b/data/languages/simplified_chinese.txt @@ -1368,3 +1368,6 @@ auto Tutorial == 进入教学 + +Can't find a Tutorial server +== diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt index 40ad5f963..1937ca5ef 100644 --- a/data/languages/slovak.txt +++ b/data/languages/slovak.txt @@ -1264,6 +1264,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt index 0329ec4d8..078a0c2eb 100644 --- a/data/languages/spanish.txt +++ b/data/languages/spanish.txt @@ -1358,3 +1358,6 @@ auto Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt index bdc180141..f56834a6a 100644 --- a/data/languages/swedish.txt +++ b/data/languages/swedish.txt @@ -1350,3 +1350,6 @@ auto Tutorial == + +Can't find a Tutorial server +== diff --git a/data/languages/traditional_chinese.txt b/data/languages/traditional_chinese.txt index cd0539eb3..03d33b66b 100644 --- a/data/languages/traditional_chinese.txt +++ b/data/languages/traditional_chinese.txt @@ -1361,3 +1361,6 @@ auto Tutorial == 進入教學 + +Can't find a Tutorial server +== diff --git a/data/languages/turkish.txt b/data/languages/turkish.txt index b00d5776a..e4aa2f497 100644 --- a/data/languages/turkish.txt +++ b/data/languages/turkish.txt @@ -1332,6 +1332,9 @@ https://wiki.ddnet.tw/ Tutorial == +Can't find a Tutorial server +== + Website == diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt index b20d4872e..2500e662b 100644 --- a/data/languages/ukrainian.txt +++ b/data/languages/ukrainian.txt @@ -1348,3 +1348,6 @@ Chat command (e.g. showall 1) Tutorial == + +Can't find a Tutorial server +== diff --git a/src/game/client/components/menus_start.cpp b/src/game/client/components/menus_start.cpp index b5c0b8461..d2809c051 100644 --- a/src/game/client/components/menus_start.cpp +++ b/src/game/client/components/menus_start.cpp @@ -66,13 +66,26 @@ void CMenus::RenderStartMenu(CUIRect MainView) ExtMenu.HSplitBottom(5.0f, &ExtMenu, 0); // little space ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button); static int s_TutorialButton; - if(DoButton_Menu(&s_TutorialButton, Localize("Tutorial"), 0, &Button, 0, CUI::CORNER_ALL, 5.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.5f), vec4(0.0f, 0.0f, 0.0f, 0.25f))) + static float s_JoinTutorialTime = 0.0f; + if(DoButton_Menu(&s_TutorialButton, Localize("Tutorial"), 0, &Button, 0, CUI::CORNER_ALL, 5.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.5f), vec4(0.0f, 0.0f, 0.0f, 0.25f)) || + (s_JoinTutorialTime != 0.0f && Client()->LocalTime() >= s_JoinTutorialTime)) { const char *pAddr = ServerBrowser()->GetTutorialServer(); if(pAddr) + { Client()->Connect(pAddr); + s_JoinTutorialTime = 0.0f; + } + else if(s_JoinTutorialTime == 0.0f) + { + dbg_msg("menus", "couldn't find tutorial server, retrying in 5 seconds"); + s_JoinTutorialTime = Client()->LocalTime() + 5.0f; + } else - dbg_msg("menus", "couldn't find tutorial server"); + { + PopupWarning(Localize("Warning"), Localize("Can't find a Tutorial server"), Localize("Ok"), 10000000); + s_JoinTutorialTime = 0.0f; + } m_DoubleClickIndex = -1; } @@ -145,7 +158,7 @@ void CMenus::RenderStartMenu(CUIRect MainView) } static bool EditorHotkeyWasPressed = true; - static float EditorHotKeyChecktime = 0; + static float EditorHotKeyChecktime = 0.0f; Menu.HSplitBottom(5.0f, &Menu, 0); // little space Menu.HSplitBottom(40.0f, &Menu, &Button); static int s_MapEditorButton;