diff --git a/Source/DiabloUI/multi/selconn.cpp b/Source/DiabloUI/multi/selconn.cpp index f68048f49..9c4a6253c 100644 --- a/Source/DiabloUI/multi/selconn.cpp +++ b/Source/DiabloUI/multi/selconn.cpp @@ -12,7 +12,7 @@ int provider; const char *ConnectionNames[] { "ZeroTier", N_("Client-Server (TCP)"), - N_("Loopback"), + N_("Offline"), }; namespace { diff --git a/Source/automap.cpp b/Source/automap.cpp index 50b38ebe6..94da6860b 100644 --- a/Source/automap.cpp +++ b/Source/automap.cpp @@ -719,7 +719,7 @@ void DrawAutomapText(const Surface &out) Point linePosition { 8, 8 }; if (gbIsMultiplayer) { - if (GameName != "0.0.0.0") { + if (GameName != "0.0.0.0" && !IsLoopback) { std::string description = std::string(_("Game: ")); description.append(GameName); DrawString(out, description, linePosition); @@ -727,7 +727,9 @@ void DrawAutomapText(const Surface &out) } std::string description; - if (!PublicGame) { + if (IsLoopback) { + description = std::string(_("Offline Game")); + } else if (!PublicGame) { description = std::string(_("Password: ")); description.append(GamePassword); } else { diff --git a/Source/dvlnet/loopback.cpp b/Source/dvlnet/loopback.cpp index 9b4632b6b..eac4d08b4 100644 --- a/Source/dvlnet/loopback.cpp +++ b/Source/dvlnet/loopback.cpp @@ -12,6 +12,7 @@ namespace net { int loopback::create(std::string /*addrstr*/) { + IsLoopback = true; return plr_single; } @@ -87,6 +88,7 @@ bool loopback::SNetUnregisterEventHandler(event_type /*evtype*/) bool loopback::SNetLeaveGame(int /*type*/) { + IsLoopback = false; return true; } diff --git a/Source/multi.cpp b/Source/multi.cpp index 072f41b9a..052ab0955 100644 --- a/Source/multi.cpp +++ b/Source/multi.cpp @@ -62,6 +62,7 @@ uint8_t gbDeltaSender; bool sgbNetInited; uint32_t player_state[MAX_PLRS]; Uint32 playerInfoTimers[MAX_PLRS]; +bool IsLoopback; /** * Contains the set of supported event types supported by the multiplayer diff --git a/Source/multi.h b/Source/multi.h index 012fb3744..0772828ee 100644 --- a/Source/multi.h +++ b/Source/multi.h @@ -53,6 +53,7 @@ extern std::string GamePassword; extern bool PublicGame; extern uint8_t gbDeltaSender; extern uint32_t player_state[MAX_PLRS]; +extern bool IsLoopback; void InitGameInfo(); void NetSendLoPri(int playerId, const byte *data, size_t size); diff --git a/Translations/bg.po b/Translations/bg.po index c3c3a9b16..005a29385 100644 --- a/Translations/bg.po +++ b/Translations/bg.po @@ -368,7 +368,8 @@ msgid "Client-Server (TCP)" msgstr "Клиент-сървър (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Обратна връзка" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1469,7 +1470,7 @@ msgstr "{} трудност" msgid "In Menu" msgstr "В меню" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "Обратна връзка" diff --git a/Translations/cs.po b/Translations/cs.po index ca13f5e15..702c94c33 100644 --- a/Translations/cs.po +++ b/Translations/cs.po @@ -367,7 +367,8 @@ msgid "Client-Server (TCP)" msgstr "Klient-Server (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Smyčka" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1467,7 +1468,7 @@ msgstr "{} obtížnost" msgid "In Menu" msgstr "V Menu" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "zpětná vazba" diff --git a/Translations/da.po b/Translations/da.po index ab9f2156e..cc24a5f24 100644 --- a/Translations/da.po +++ b/Translations/da.po @@ -393,7 +393,8 @@ msgid "Client-Server (TCP)" msgstr "Klient-server (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Loopback" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1607,9 +1608,9 @@ msgstr "Vælg sværhedsgrad" msgid "In Menu" msgstr "Forrige menu" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 #, fuzzy -#| msgid "Loopback" +#| msgid "loopback" msgid "loopback" msgstr "Loopback" diff --git a/Translations/de.po b/Translations/de.po index b0608525f..f09f9c7a3 100644 --- a/Translations/de.po +++ b/Translations/de.po @@ -368,7 +368,8 @@ msgid "Client-Server (TCP)" msgstr "Client-Server (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Loopback" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1475,7 +1476,7 @@ msgstr "Schwierigkeitsgrad: {}" msgid "In Menu" msgstr "Im Hauptmenü" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "Loopback" diff --git a/Translations/devilutionx.pot b/Translations/devilutionx.pot index 7e133c217..2d5e23130 100644 --- a/Translations/devilutionx.pot +++ b/Translations/devilutionx.pot @@ -362,7 +362,7 @@ msgid "Client-Server (TCP)" msgstr "" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +msgid "Offline" msgstr "" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1374,7 +1374,7 @@ msgstr "" msgid "In Menu" msgstr "" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "" diff --git a/Translations/el.po b/Translations/el.po index 81ce49b12..f36c6a7e8 100644 --- a/Translations/el.po +++ b/Translations/el.po @@ -495,7 +495,8 @@ msgid "Client-Server (TCP)" msgstr "Διακομιστή-πελάτη (TCP)" #: Source/DiabloUI/multi/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Βρόχος επιστροφής" #: Source/DiabloUI/multi/selconn.cpp:56 Source/DiabloUI/multi/selgame.cpp:647 @@ -1783,7 +1784,7 @@ msgstr "Δυσκολία {}" msgid "In Menu" msgstr "Στο Μενού" -#: Source/dvlnet/loopback.cpp:116 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "βρόχος επιστροφής" diff --git a/Translations/es.po b/Translations/es.po index 860773da1..27313d7e6 100644 --- a/Translations/es.po +++ b/Translations/es.po @@ -370,7 +370,8 @@ msgid "Client-Server (TCP)" msgstr "Cliente-Servidor (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Loopback" #: Source/DiabloUI/selconn.cpp:56 Source/DiabloUI/selgame.cpp:645 @@ -1744,8 +1745,8 @@ msgstr "{} dificultad" msgid "In Menu" msgstr "En Menú" -#: Source/dvlnet/loopback.cpp:114 -msgid "loopback" +#: Source/dvlnet/loopback.cpp:118 +msgid "loopback" msgstr "loopback" #: Source/dvlnet/tcp_client.cpp:65 diff --git a/Translations/fr.po b/Translations/fr.po index 2801331b3..d744d0c72 100644 --- a/Translations/fr.po +++ b/Translations/fr.po @@ -367,7 +367,8 @@ msgid "Client-Server (TCP)" msgstr "Client-Serveur (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Rebouclage (Loopback)" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1475,7 +1476,7 @@ msgstr "Difficulté {}" msgid "In Menu" msgstr "Dans le Menu" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "rebouclage (loopback)" diff --git a/Translations/hr.po b/Translations/hr.po index 94a3e82a1..7d4a94484 100644 --- a/Translations/hr.po +++ b/Translations/hr.po @@ -369,7 +369,8 @@ msgid "Client-Server (TCP)" msgstr "Klijent-Poslužitelj (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Izvanmrežno" #: Source/DiabloUI/selconn.cpp:56 Source/DiabloUI/selgame.cpp:634 @@ -1468,7 +1469,7 @@ msgstr "{} težina" msgid "In Menu" msgstr "U izbornik" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "izvanmrežno" diff --git a/Translations/it.po b/Translations/it.po index 416f7d803..35cd5477d 100644 --- a/Translations/it.po +++ b/Translations/it.po @@ -508,7 +508,8 @@ msgid "Client-Server (TCP)" msgstr "Client-Server (TCP)" #: Source/DiabloUI/multi/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Loopback" #: Source/DiabloUI/multi/selconn.cpp:56 Source/DiabloUI/multi/selgame.cpp:645 @@ -1783,7 +1784,7 @@ msgstr "Difficoltà {}" msgid "In Menu" msgstr "Nel Menu" -#: Source/dvlnet/loopback.cpp:114 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "loopback" diff --git a/Translations/ja.po b/Translations/ja.po index cf1f99b75..115f093cc 100644 --- a/Translations/ja.po +++ b/Translations/ja.po @@ -366,7 +366,8 @@ msgid "Client-Server (TCP)" msgstr "クライアント - サーバー (​TCP​)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "ループ​バック" #: Source/DiabloUI/selconn.cpp:56 Source/DiabloUI/selgame.cpp:638 @@ -1705,8 +1706,8 @@ msgstr "{} 難易度" msgid "In Menu" msgstr "メニュー​に​ある" -#: Source/dvlnet/loopback.cpp:114 -msgid "loopback" +#: Source/dvlnet/loopback.cpp:118 +msgid "loopback" msgstr "loopback" #: Source/dvlnet/tcp_client.cpp:65 diff --git a/Translations/ko.po b/Translations/ko.po index 16c0bbfb9..8a1ca3627 100644 --- a/Translations/ko.po +++ b/Translations/ko.po @@ -498,7 +498,8 @@ msgid "Client-Server (TCP)" msgstr "클라이언트-서버 (TCP)" #: Source/DiabloUI/multi/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "루프백" #: Source/DiabloUI/multi/selconn.cpp:56 Source/DiabloUI/multi/selgame.cpp:647 @@ -1764,7 +1765,7 @@ msgstr "{} 난이도" msgid "In Menu" msgstr "메뉴" -#: Source/dvlnet/loopback.cpp:116 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "루프백" diff --git a/Translations/pl.po b/Translations/pl.po index 31e15ea4a..e0eee7a1d 100644 --- a/Translations/pl.po +++ b/Translations/pl.po @@ -370,7 +370,8 @@ msgid "Client-Server (TCP)" msgstr "Klient-Serwer (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Loopback" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1475,7 +1476,7 @@ msgstr "{} Poziom Trudności" msgid "In Menu" msgstr "W Menu" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "loopback" diff --git a/Translations/pt_BR.po b/Translations/pt_BR.po index e673c580e..be2c5ab2d 100644 --- a/Translations/pt_BR.po +++ b/Translations/pt_BR.po @@ -370,7 +370,8 @@ msgid "Client-Server (TCP)" msgstr "Cliente-Servidor (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Loopback" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1473,7 +1474,7 @@ msgstr "Dificuldade {}" msgid "In Menu" msgstr "No Menu" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "loopback" diff --git a/Translations/ro.po b/Translations/ro.po index f4bb66454..4c23714c4 100644 --- a/Translations/ro.po +++ b/Translations/ro.po @@ -367,7 +367,8 @@ msgid "Client-Server (TCP)" msgstr "Client-Server (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Local" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1544,7 +1545,7 @@ msgstr "Sel. dificultate" msgid "In Menu" msgstr "Meniu" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "local" diff --git a/Translations/ru.po b/Translations/ru.po index bd8b4ba5a..8cb73ce12 100644 --- a/Translations/ru.po +++ b/Translations/ru.po @@ -377,7 +377,8 @@ msgid "Client-Server (TCP)" msgstr "Клиент-сервер (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Петля" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1498,7 +1499,7 @@ msgstr "{} сложность" msgid "In Menu" msgstr "В меню" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "петля" diff --git a/Translations/sv.po b/Translations/sv.po index 504689b1c..ee9080003 100644 --- a/Translations/sv.po +++ b/Translations/sv.po @@ -367,7 +367,8 @@ msgid "Client-Server (TCP)" msgstr "Klient-Server (TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Loopback" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1466,7 +1467,7 @@ msgstr "{} svårighetsgrad" msgid "In Menu" msgstr "I Menyn" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "loopback" diff --git a/Translations/uk.po b/Translations/uk.po index 40201d6ad..f8651b45c 100644 --- a/Translations/uk.po +++ b/Translations/uk.po @@ -505,7 +505,8 @@ msgid "Client-Server (TCP)" msgstr "Клієнт-Сервер (TCP)" #: Source/DiabloUI/multi/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "Петльова адреса" #: Source/DiabloUI/multi/selconn.cpp:56 Source/DiabloUI/multi/selgame.cpp:647 @@ -1785,7 +1786,7 @@ msgstr "{} Складність" msgid "In Menu" msgstr "В Меню" -#: Source/dvlnet/loopback.cpp:116 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "петльова адреса" diff --git a/Translations/zh_CN.po b/Translations/zh_CN.po index f66929e5f..b14ee8cd2 100644 --- a/Translations/zh_CN.po +++ b/Translations/zh_CN.po @@ -368,7 +368,8 @@ msgid "Client-Server (TCP)" msgstr "客户​端​-​服务器​(​TCP)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "回环" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1448,7 +1449,7 @@ msgstr "难度​:​{}" msgid "In Menu" msgstr "菜​单​中" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "环回" diff --git a/Translations/zh_TW.po b/Translations/zh_TW.po index ec2540323..c772f3fab 100644 --- a/Translations/zh_TW.po +++ b/Translations/zh_TW.po @@ -370,7 +370,8 @@ msgid "Client-Server (TCP)" msgstr "客​戶端伺服器​(​TCP​)" #: Source/DiabloUI/selconn.cpp:15 -msgid "Loopback" +#, fuzzy +msgid "Offline" msgstr "環​回" #: Source/DiabloUI/selconn.cpp:54 Source/DiabloUI/selgame.cpp:604 @@ -1549,7 +1550,7 @@ msgstr "選​擇​難度" msgid "In Menu" msgstr "主​菜單" -#: Source/dvlnet/loopback.cpp:113 +#: Source/dvlnet/loopback.cpp:118 msgid "loopback" msgstr "環​回"