From a0840ee58b32aec83c38a2c093f9084a7c6f936f Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 12 Nov 2009 20:33:30 +0000 Subject: [PATCH] (svn r18052) -Codechange/Fix: make the 'pause' chat message when actually executing the pause command. This to prevent showing paused and especially unpaused to be shown when the state doesn't change. Output now mentions whether pause changes keep the game paused and what reasons for pausing there 'currently' are. --- src/lang/afrikaans.txt | 4 --- src/lang/arabic_egypt.txt | 5 --- src/lang/brazilian_portuguese.txt | 5 --- src/lang/bulgarian.txt | 5 --- src/lang/catalan.txt | 5 --- src/lang/croatian.txt | 5 --- src/lang/czech.txt | 5 --- src/lang/danish.txt | 5 --- src/lang/dutch.txt | 5 --- src/lang/english.txt | 14 ++++++--- src/lang/english_US.txt | 5 --- src/lang/esperanto.txt | 5 --- src/lang/estonian.txt | 5 --- src/lang/finnish.txt | 5 --- src/lang/french.txt | 5 --- src/lang/galician.txt | 5 --- src/lang/german.txt | 5 --- src/lang/greek.txt | 5 --- src/lang/hebrew.txt | 5 --- src/lang/hungarian.txt | 5 --- src/lang/icelandic.txt | 5 --- src/lang/indonesian.txt | 5 --- src/lang/italian.txt | 5 --- src/lang/japanese.txt | 5 --- src/lang/korean.txt | 5 --- src/lang/latvian.txt | 5 --- src/lang/lithuanian.txt | 5 --- src/lang/luxembourgish.txt | 5 --- src/lang/norwegian_bokmal.txt | 5 --- src/lang/norwegian_nynorsk.txt | 5 --- src/lang/polish.txt | 5 --- src/lang/portuguese.txt | 5 --- src/lang/romanian.txt | 5 --- src/lang/russian.txt | 5 --- src/lang/serbian.txt | 5 --- src/lang/simplified_chinese.txt | 5 --- src/lang/slovak.txt | 5 --- src/lang/slovenian.txt | 5 --- src/lang/spanish.txt | 5 --- src/lang/swedish.txt | 5 --- src/lang/traditional_chinese.txt | 5 --- src/lang/turkish.txt | 5 --- src/lang/ukrainian.txt | 5 --- src/lang/unfinished/basque.txt | 1 - src/lang/unfinished/frisian.txt | 1 - src/lang/welsh.txt | 5 --- src/misc_cmd.cpp | 20 +++++++++--- src/network/network.cpp | 52 +++++++++++++++++++++++++++---- src/network/network_func.h | 2 ++ src/network/network_server.cpp | 3 -- src/network/network_type.h | 9 ------ 51 files changed, 72 insertions(+), 244 deletions(-) diff --git a/src/lang/afrikaans.txt b/src/lang/afrikaans.txt index 5cf129ba1d..887ffc1a68 100644 --- a/src/lang/afrikaans.txt +++ b/src/lang/afrikaans.txt @@ -1696,11 +1696,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :verskaffer vol ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Speletjie gepoos (not enough players) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Speletjie ongepoos (genoeg spelers) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Speletjie gepoos (konnekteer kliënt) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :verlaat STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} het by die spel aangesluit diff --git a/src/lang/arabic_egypt.txt b/src/lang/arabic_egypt.txt index 0c2bdac65d..5df3ea891c 100644 --- a/src/lang/arabic_egypt.txt +++ b/src/lang/arabic_egypt.txt @@ -1728,12 +1728,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :خادم ممت ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :اللعب متوقف - ليس هناك عدد لاعبين كافي -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :استعادة اللعب - عدد اللاعبين كافي -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :اللعب متوقف - ربط لاعب -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :الاستمرار باللعب - تم ربط اللاعب ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :يغادر STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} قد انضم للعبة diff --git a/src/lang/brazilian_portuguese.txt b/src/lang/brazilian_portuguese.txt index 6158665a50..d65bd27044 100644 --- a/src/lang/brazilian_portuguese.txt +++ b/src/lang/brazilian_portuguese.txt @@ -1727,12 +1727,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :servidor cheio ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Jogo pausado (faltam jogadores) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Jogo des-pausado (jogadores suficientes) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Jogo pausado (cliente conectando) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Jogo des-pausado (cliente conectado) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :saindo STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} entrou no jogo diff --git a/src/lang/bulgarian.txt b/src/lang/bulgarian.txt index ee5fef4256..57c1bb7b70 100644 --- a/src/lang/bulgarian.txt +++ b/src/lang/bulgarian.txt @@ -1711,12 +1711,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :сървъръ ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Играта е на пауза (няма достатъчно играчи) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Играта продължава (отново има достатъчно играчи) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Играта е на пауза (свързва се нов играч) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Играта продължава (новият играч се свърза) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :напускам STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} се присъедини към играта diff --git a/src/lang/catalan.txt b/src/lang/catalan.txt index 60936acb79..bd73ee86e7 100644 --- a/src/lang/catalan.txt +++ b/src/lang/catalan.txt @@ -1728,12 +1728,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :servidor ple ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Joc en pausa (no hi ha prou jugadors) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Joc en marxa (hi ha prou jugadors) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Joc en pausa (connectant client) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Joc en marxa (client connectat) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :deixant STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} s'ha unit al joc diff --git a/src/lang/croatian.txt b/src/lang/croatian.txt index 2f8669240f..cfc4c605f7 100644 --- a/src/lang/croatian.txt +++ b/src/lang/croatian.txt @@ -1781,12 +1781,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :poslužitelj je ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Izgra zaustavljena (nema dovoljno igrača) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Igra nastavljena (dovoljno igrača) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Igra zaustavljena (spajam klijenta) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Igra nastavljena (klijent spojen) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :odlazim STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} se pridružio igri diff --git a/src/lang/czech.txt b/src/lang/czech.txt index 85156e6636..feef6184cb 100644 --- a/src/lang/czech.txt +++ b/src/lang/czech.txt @@ -1789,12 +1789,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :na serveru je p ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Hra pozastavena (není dost hráčů) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Hra spuštěna (dostatek hráčů) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Hra pozastavena (hráč se připojuje) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Hra spuštěna (hráč připojen) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :odpojování STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} jde hrát diff --git a/src/lang/danish.txt b/src/lang/danish.txt index 426ef89fa6..e7eb6c7046 100644 --- a/src/lang/danish.txt +++ b/src/lang/danish.txt @@ -1726,12 +1726,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :serveren er ful ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Spil på pause (for få spillere) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spil ikke længere på pause (nok spillere igen) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spil på pause (tilslutter klient) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spil ikke længere på pause (klient tilsluttet) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlader STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har tilsluttet sig spillet diff --git a/src/lang/dutch.txt b/src/lang/dutch.txt index bd27878e24..77d9fa43cc 100644 --- a/src/lang/dutch.txt +++ b/src/lang/dutch.txt @@ -1728,12 +1728,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server is vol ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Spel gepauzeerd (te weinig spelers) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spel hervat (genoeg spelers) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spel gepauzeerd (inkomende client) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spel hervat (client verbonden) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :vertrekt STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} heeft zich bij het spel gevoegd diff --git a/src/lang/english.txt b/src/lang/english.txt index 5154b12348..531d86d499 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -1728,12 +1728,16 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server full ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} +STR_NETWORK_SERVER_MESSAGE :*** {1:RAW_STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Game paused (not enough players) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Game unpaused (enough players) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Game paused (connecting clients) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Game unpaused (no connecting clients) +STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED :Game paused ({STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 :Game still paused ({STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_2 :Game still paused ({STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_3 :Game still paused ({STRING}, {STRING}, {STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED :Game unpaused ({STRING}) +STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS :not enough players +STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS :connecting clients +STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL :manual ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :leaving STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {RAW_STRING} has joined the game diff --git a/src/lang/english_US.txt b/src/lang/english_US.txt index f42200a85e..33fe0cf5ed 100644 --- a/src/lang/english_US.txt +++ b/src/lang/english_US.txt @@ -1725,12 +1725,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server full ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Game paused (not enough players) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Game unpaused (enough players) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Game paused (connecting client) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Game unpaused (client connected) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :leaving STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} has joined the game diff --git a/src/lang/esperanto.txt b/src/lang/esperanto.txt index 092c7e1f94..a288bed183 100644 --- a/src/lang/esperanto.txt +++ b/src/lang/esperanto.txt @@ -1669,12 +1669,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :servilo plenas ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Ludo paŭzita (ne sufiĉaj ludantoj) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Ludo malpaŭzita (sufiĉaj ludandoj) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Ludo paŭzita (konektanta kliento) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Ludo malpaŭzita (kliento konektita) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlasanta STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} ensalutis la ludon diff --git a/src/lang/estonian.txt b/src/lang/estonian.txt index e724b7505c..c5d0d11cff 100644 --- a/src/lang/estonian.txt +++ b/src/lang/estonian.txt @@ -1784,12 +1784,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server on täis ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Mäng seisab (pole piisavalt mängijaid) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Mäng jätkub (piisavalt mängijaid) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Mäng seisab (ühenduv klient) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Mäng jätkub (klient ühendunud) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :lahkub STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} liitus mänguga diff --git a/src/lang/finnish.txt b/src/lang/finnish.txt index d611cbce3c..f2e8153563 100644 --- a/src/lang/finnish.txt +++ b/src/lang/finnish.txt @@ -1728,12 +1728,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :palvelin täynn ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Peli pysäytetty (ei tarpeeksi pelaajia) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Peliä jatketaan (tarpeeksi pelaajia) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Peli pysäytetty (yhdistävä asiakas) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Peliä jatketaan (asiakas yhdistänyt) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :poistutaan STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} on liittynyt peliin diff --git a/src/lang/french.txt b/src/lang/french.txt index 61ddeefc97..12fae26437 100644 --- a/src/lang/french.txt +++ b/src/lang/french.txt @@ -1729,12 +1729,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :Serveur complet ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Partie suspendue (pas assez de joueurs) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partie reprise (assez de joueurs) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partie suspendue (connexion d'un client) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partie reprise (client connecté) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :départ STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} a rejoint la partie diff --git a/src/lang/galician.txt b/src/lang/galician.txt index b70f61fa95..8d07c014e6 100644 --- a/src/lang/galician.txt +++ b/src/lang/galician.txt @@ -1697,12 +1697,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :servidor cheo ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Partida en pausa (non hai suficientes xogadores) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partida funcionando (hai suficientes xogadores) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partida en pausa (cliente conectando) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partida funcionando (cliente conectado) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :saíndo STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} uniuse á partida diff --git a/src/lang/german.txt b/src/lang/german.txt index 0b7f82cbd5..fb9e0d15c1 100644 --- a/src/lang/german.txt +++ b/src/lang/german.txt @@ -1729,12 +1729,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :Server voll ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Spiel angehalten (nicht genug Spieler) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spiel fortgesetzt (genug Spieler) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spiel angehalten (Teilnehmer meldet sich an) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spiel fortgesetzt (Teilnehmer ist angemeldet) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :geht STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} ist dem Spiel beigetreten diff --git a/src/lang/greek.txt b/src/lang/greek.txt index 0688433ffb..d6f0355de8 100644 --- a/src/lang/greek.txt +++ b/src/lang/greek.txt @@ -1792,12 +1792,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :Διακομι ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Παύση παιχνιδιού (δεν υπάρχουν αρκετοί παίκτες) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Συνέχιση παιχνιδιού (υπάρχουν αρκετοί παίκτες) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Παύση παιχνιδιού (σύνδεση πελάτη) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Συνέχιση παιχνιδιού (πελάτης συνδέθηκε) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :αποχώρηση STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} συμμετέχει στο παιχνίδι diff --git a/src/lang/hebrew.txt b/src/lang/hebrew.txt index 1299aacaf1..c45faed228 100644 --- a/src/lang/hebrew.txt +++ b/src/lang/hebrew.txt @@ -1726,12 +1726,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :השרת מלא ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :(המשחק הושהה (אין מספיק משתתפים -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :(המשחק הופשר (יש די משתתפים -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :(המשחק הושהה (משתמש מתחבר -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :(המשחק הופשר (משתמש התחבר ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :עוזב STR_NETWORK_MESSAGE_CLIENT_JOINED :הצטרף למשחק {STRING} *** diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index 6b96a33852..1ec7d3b123 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -1762,12 +1762,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :a szerver megte ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Játék felfüggesztve (nincs elég játékos) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Játék elindítva (van elég játékos) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Játék felfüggesztve (kapcsolódó kliens) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Játék elindítva (a kliens sikeresen csatlakozott) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :kilépés STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} csatlakozott a játékhoz diff --git a/src/lang/icelandic.txt b/src/lang/icelandic.txt index f2162c2524..1e04d2f089 100644 --- a/src/lang/icelandic.txt +++ b/src/lang/icelandic.txt @@ -1717,12 +1717,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :vefþjónn full ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Leikur í bið (ekki nógu margir leikmenn) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Leikur gangsettur (nægilega margir leikmenn) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Leikur í bið (tengi notanda) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Leikur gangsettur (notandi tengdur) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :yfirgefur STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} tengdist leiknum diff --git a/src/lang/indonesian.txt b/src/lang/indonesian.txt index 57e3e1a245..2f434908c0 100644 --- a/src/lang/indonesian.txt +++ b/src/lang/indonesian.txt @@ -1728,12 +1728,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server penuh ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Permainan Tertahan (pemain tidak mencukupi) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Permainan Dilanjutkan (pemain cukup) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Permainan Tertahan (menghubungi pemain lainnya) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Permainan Dilanjutkan (pemain telah terhubung) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :pergi STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} telah bergabung diff --git a/src/lang/italian.txt b/src/lang/italian.txt index d9415a8aed..bb85eb1687 100644 --- a/src/lang/italian.txt +++ b/src/lang/italian.txt @@ -1730,12 +1730,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server pieno ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Partita in pausa (giocatori insufficienti) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partita ripresa (giocatori sufficienti) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partita in pausa (connessione client in corso) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partita ripresa (client connesso) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :abbandono della partita STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} è entrato nella partita diff --git a/src/lang/japanese.txt b/src/lang/japanese.txt index 4ea63c3423..c16d7c4160 100644 --- a/src/lang/japanese.txt +++ b/src/lang/japanese.txt @@ -1686,12 +1686,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :サーバ満員 ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :ゲームは一時停止（プレヤー人数不足） -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :ゲーム停止解除（プレヤー人数十分） -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :ゲームは一時停止（クライアントが接続中） -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :ゲーム停止解除（クライアントが接続済み） ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :退出 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} は参加してきました diff --git a/src/lang/korean.txt b/src/lang/korean.txt index 6dd49df680..90be02f051 100644 --- a/src/lang/korean.txt +++ b/src/lang/korean.txt @@ -1726,12 +1726,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :서버 꽉참 ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :게임 일시정지됨 (플레이어가 부족합니다) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :게임 재개됨 (플레이어가 충분히 모였습니다) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :게임 일시정지됨 (클라이언트 연결중) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :게임 재개됨 (클라이언트 연결됨) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :떠남 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING}님이 게임에 참여했습니다 diff --git a/src/lang/latvian.txt b/src/lang/latvian.txt index e75e677c25..93cc5fd9c7 100644 --- a/src/lang/latvian.txt +++ b/src/lang/latvian.txt @@ -1725,12 +1725,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :serveris pilns ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Spēle nopauzēta (nepietiek dalībnieku) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spēle atsākta (pietiekams dalībnieku skaits) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spēle nopauzēta (pieslēdzas dalībniekam) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spēle atsākta (dalībnieks pieslēdzies) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :aizeju STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} ir pievienojies spēlei diff --git a/src/lang/lithuanian.txt b/src/lang/lithuanian.txt index d165bd6b3f..85184289bd 100644 --- a/src/lang/lithuanian.txt +++ b/src/lang/lithuanian.txt @@ -1756,12 +1756,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :serveris pilnas ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Žaidimas sustabdytas (trūksta žaidėjų) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Žaidimas veikia (Užtenka žaidėjų) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Žaidimas sustabdytas (Prijungiamas klientas) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Žaidimas veikia (Klientas pajungtas) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :išeinama STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} prisijungė prie žaidimo diff --git a/src/lang/luxembourgish.txt b/src/lang/luxembourgish.txt index a9b677e052..1384796f83 100644 --- a/src/lang/luxembourgish.txt +++ b/src/lang/luxembourgish.txt @@ -1713,12 +1713,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :Server voll ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Spill gepaust (nët genuch Spiller) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spill leeft erëm (genuch Spiller) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spill gepaust (Spiller connectéiert) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spill leeft erëm (Client ass connectéiert) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :verloossen STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} ass dem Spill baigetrueden diff --git a/src/lang/norwegian_bokmal.txt b/src/lang/norwegian_bokmal.txt index dbc8340a02..0f15555f77 100644 --- a/src/lang/norwegian_bokmal.txt +++ b/src/lang/norwegian_bokmal.txt @@ -1723,12 +1723,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :serveren er ful ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Spill satt på pause (for få spillere) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spill gjennopptatt (nok spillere) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spill satt på pause (klient kobler seg til) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spill gjennopptatt (klient koblet til) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlater STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har blitt med i spillet diff --git a/src/lang/norwegian_nynorsk.txt b/src/lang/norwegian_nynorsk.txt index 868c6535df..e74ab8090f 100644 --- a/src/lang/norwegian_nynorsk.txt +++ b/src/lang/norwegian_nynorsk.txt @@ -1697,12 +1697,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :tenaren er full ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Spel sett på pause (ikkje nok spelarar) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spel gjenoppteke (nok spelarar) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spel sett på pause (klient koblar seg til) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spel gjenoppteke (klient tilkobla) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :forlet STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har blitt med i spelet diff --git a/src/lang/polish.txt b/src/lang/polish.txt index b75a04bfc7..9a9ff1352c 100644 --- a/src/lang/polish.txt +++ b/src/lang/polish.txt @@ -2108,12 +2108,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :serwer jest pe ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Gra zatrzymana (za mało graczy) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Gra wznowiona (wystarczająca ilość graczy) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Gra zatrzymana (łączenie klienta) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Gra wznowiona (klient połączony) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :opuszczanie STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} dołączył do gry. diff --git a/src/lang/portuguese.txt b/src/lang/portuguese.txt index 3664991929..3d3d10bfe1 100644 --- a/src/lang/portuguese.txt +++ b/src/lang/portuguese.txt @@ -1728,12 +1728,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :servidor cheio ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Jogo em pausa (não existem jogadores suficientes) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Jogo a decorrer (número de jogadores suficiente) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Jogo em pausa (conexão cliente em curso) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Jogo a decorrer (cliente ligado) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :a sair STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} entrou no jogo diff --git a/src/lang/romanian.txt b/src/lang/romanian.txt index ae5392bd3f..cdd2c9296e 100644 --- a/src/lang/romanian.txt +++ b/src/lang/romanian.txt @@ -1727,12 +1727,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server plin ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Joc suspendat (insuficienţi jucători) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Joc continuat (suficienţi jucători) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Joc suspendat (conectare client) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Joc continuat (client conectat) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :iese STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} a intrat in joc diff --git a/src/lang/russian.txt b/src/lang/russian.txt index 40b600595a..ae8939281c 100644 --- a/src/lang/russian.txt +++ b/src/lang/russian.txt @@ -1881,12 +1881,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :сервер п ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Пауза (нет игроков) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Игра запущена (есть игроки) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Пауза (подключение клиента) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Игра запущена (клиент подключился) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :покинул STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} подключился к игре diff --git a/src/lang/serbian.txt b/src/lang/serbian.txt index 1d313a1c44..632166d066 100644 --- a/src/lang/serbian.txt +++ b/src/lang/serbian.txt @@ -1913,12 +1913,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server je pun ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Partija pauzirana (nema dovoljno igrača) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Partija nastavljena (ima dovoljno igrača) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Partija pauzirana (igrač se priključuje) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Partija nastavljena (igrač je priključen) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :napušta STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} se priključio partiji diff --git a/src/lang/simplified_chinese.txt b/src/lang/simplified_chinese.txt index bfae086fd5..e184e3e763 100644 --- a/src/lang/simplified_chinese.txt +++ b/src/lang/simplified_chinese.txt @@ -1727,12 +1727,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :服务器满员 ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :游戏暂停 (玩家太少) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :游戏继续 (玩家数目达到要求) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :游戏暂停 (连接玩家) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :游戏继续 (玩家已链入) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :离开 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} 已加入游戏 diff --git a/src/lang/slovak.txt b/src/lang/slovak.txt index 8523aca3e9..256491c310 100644 --- a/src/lang/slovak.txt +++ b/src/lang/slovak.txt @@ -1794,12 +1794,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :server je plny ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Hra pozastavená (nedostatok hráčov) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Hra spustená (dostatok hráčov) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Hra pozastavená (pripája sa klient) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Hra spustená (klient sa pripojil) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :odchádza STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} vstúpil do hry diff --git a/src/lang/slovenian.txt b/src/lang/slovenian.txt index e5ae98a2ae..a45ea50bb3 100644 --- a/src/lang/slovenian.txt +++ b/src/lang/slovenian.txt @@ -1758,12 +1758,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :gostitelj zased ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Igra v pavzi (ni dovolj igralcev) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Igra obnovljena (dovolj igralcev) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Igra v pavzi (povezovanje gosta) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Igra obnovljena (gost povezan) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :zapušča STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} pristopa k igri diff --git a/src/lang/spanish.txt b/src/lang/spanish.txt index 0f2aea6fde..20baf62d39 100644 --- a/src/lang/spanish.txt +++ b/src/lang/spanish.txt @@ -1729,12 +1729,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :servidor lleno ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Juego en pausa (no hay suficientes jugadores) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Juego en marcha (suficientes jugadores) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Juego detenido (conectado cliente) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Juego en marcha (cliente conectado) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :abandonando STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} se ha unido al juego diff --git a/src/lang/swedish.txt b/src/lang/swedish.txt index 68f90badd1..bcd418a464 100644 --- a/src/lang/swedish.txt +++ b/src/lang/swedish.txt @@ -1726,12 +1726,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :servern är ful ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Spelet pausat (Inte tillräckligt med spelare) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Spelet fortsätter (Tillräckligt med spelare) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Spelet pausat (Spelare ansluter) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Spelet fortsätter (Spelare ansluten) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :lämnar STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} har gått med i spelet diff --git a/src/lang/traditional_chinese.txt b/src/lang/traditional_chinese.txt index 426b6d691b..95e5c4aa82 100644 --- a/src/lang/traditional_chinese.txt +++ b/src/lang/traditional_chinese.txt @@ -1728,12 +1728,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :伺服器已滿 ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :遊戲暫停 (玩家不足) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :遊戲繼續 (玩家足數) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :遊戲暫停 (鏈入客戶端) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :遊戲繼續 (客戶端鏈入成功) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :離開中 STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} 已加入遊戲 diff --git a/src/lang/turkish.txt b/src/lang/turkish.txt index 55459ee30d..0870110653 100644 --- a/src/lang/turkish.txt +++ b/src/lang/turkish.txt @@ -1727,12 +1727,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :sunucu dolu ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Oyun durdu (yeterli oyuncu yok) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Oyun devam ediyor (yeterli oyuncu var) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Oyun durdu (istemci bağlanıyor) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Oyun devam ediyor (istemci bağlandı) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :ayrılıyor STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} oyuna katıldı diff --git a/src/lang/ukrainian.txt b/src/lang/ukrainian.txt index a992c6d3bf..db8227f9b7 100644 --- a/src/lang/ukrainian.txt +++ b/src/lang/ukrainian.txt @@ -1853,12 +1853,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :сервер п ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Гру призупинено (недостатньо гравців) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Гру продовжено (достатньо гравців) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Гру призупинено (приєднується клієнт) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Гру продовжено (клієнт приєднався) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :виходжу... STR_NETWORK_MESSAGE_CLIENT_JOINED :*** {STRING} приєднався до гри diff --git a/src/lang/unfinished/basque.txt b/src/lang/unfinished/basque.txt index bc1df07015..a29a75e882 100644 --- a/src/lang/unfinished/basque.txt +++ b/src/lang/unfinished/basque.txt @@ -891,7 +891,6 @@ STR_NETWORK_START_SERVER_LANGUAGE_COMBO :{BLACK}{STRING} ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! ############ End of leave-in-this-order diff --git a/src/lang/unfinished/frisian.txt b/src/lang/unfinished/frisian.txt index 83c0fd690b..c75a73606b 100644 --- a/src/lang/unfinished/frisian.txt +++ b/src/lang/unfinished/frisian.txt @@ -1045,7 +1045,6 @@ STR_NETWORK_ERROR_CLIENT_SAVEGAME :koe it lân net ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_JOINED_ID :*** {STRING} der is ien bykommen(Client #{2:NUM}) diff --git a/src/lang/welsh.txt b/src/lang/welsh.txt index 6fdd329839..12e2810b63 100644 --- a/src/lang/welsh.txt +++ b/src/lang/welsh.txt @@ -1716,12 +1716,7 @@ STR_NETWORK_ERROR_CLIENT_SERVER_FULL :gweinydd llawn ############ End of leave-in-this-order # Network related errors -STR_NETWORK_SERVER_MESSAGE :*** {2:STRING} ############ Leave those lines in this order!! -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS :Gêm wedi'i seibio (dim digon o chwaraewyr) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS :Gêm wedi'i ddadseibio (digon o chwaraewyr) -STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT :Gêm wedi'i seibio (cysylltu â chleient) -STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT :Gêm wedi'i ddadseibio (wedi cysylltu â chleient) ############ End of leave-in-this-order STR_NETWORK_MESSAGE_CLIENT_LEAVING :wrthi'n gadael STR_NETWORK_MESSAGE_CLIENT_JOINED :*** Mae {STRING} wedi ymuno â'r gêm diff --git a/src/misc_cmd.cpp b/src/misc_cmd.cpp index ee46928c30..cc15bb8f50 100644 --- a/src/misc_cmd.cpp +++ b/src/misc_cmd.cpp @@ -16,6 +16,7 @@ #include "window_func.h" #include "textbuf_gui.h" #include "network/network.h" +#include "network/network_func.h" #include "company_manager_face.h" #include "strings_func.h" #include "gfx_func.h" @@ -329,10 +330,11 @@ static void AskUnsafeUnpauseCallback(Window *w, bool confirmed) DoCommandP(0, PM_PAUSED_ERROR, confirmed ? 0 : 1, CMD_PAUSE); } -/** Pause/Unpause the game (server-only). - * Increase or decrease the pause counter. If the counter is zero, - * the game is unpaused. A counter is used instead of a boolean value - * to have more control over the game when saving/loading, etc. +/** + * Pause/Unpause the game (server-only). + * Set or unset a bit in the pause mode. If pause mode is zero the game is + * unpaused. A bitset is used instead of a boolean value/counter to have + * more control over the game when saving/loading, etc. * @param tile unused * @param flags operation to perform * @param p1 the pause mode to change @@ -353,7 +355,7 @@ CommandCost CmdPause(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, case PM_PAUSED_ACTIVE_CLIENTS: if (!_networking) return CMD_ERROR; break; -#endif +#endif /* ENABLE_NETWORK */ default: return CMD_ERROR; } @@ -366,11 +368,19 @@ CommandCost CmdPause(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, AskUnsafeUnpauseCallback ); } else { +#ifdef ENABLE_NETWORK + PauseMode prev_mode = _pause_mode; +#endif /* ENABLE_NETWORK */ + if (p2 == 0) { _pause_mode = _pause_mode & ~p1; } else { _pause_mode = _pause_mode | p1; } + +#ifdef ENABLE_NETWORK + NetworkHandlePauseChange(prev_mode, (PauseMode)p1); +#endif /* ENABLE_NETWORK */ } SetWindowDirty(WC_STATUS_BAR, 0); diff --git a/src/network/network.cpp b/src/network/network.cpp index 957e764fe4..b8d79d3272 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -35,6 +35,7 @@ #include "../landscape_type.h" #include "../rev.h" #include "../core/pool_func.hpp" +#include "../gfx_func.h" #ifdef DEBUG_DUMP_COMMANDS #include "../fileio_func.h" #endif /* DEBUG_DUMP_COMMANDS */ @@ -216,11 +217,8 @@ void NetworkTextMessage(NetworkAction action, ConsoleColour colour, bool self_se switch (action) { case NETWORK_ACTION_SERVER_MESSAGE: /* Ignore invalid messages */ - if (data >= NETWORK_SERVER_MESSAGE_END) return; - strid = STR_NETWORK_SERVER_MESSAGE; colour = CC_DEFAULT; - data = STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS + data; break; case NETWORK_ACTION_COMPANY_SPECTATOR: colour = CC_DEFAULT; @@ -352,6 +350,51 @@ StringID GetNetworkErrorMsg(NetworkErrorCode err) return network_error_strings[err]; } +/** + * Handle the pause mode change so we send the right messages to the chat. + * @param prev_mode The previous pause mode. + * @param changed_mode The pause mode that got changed. + */ +void NetworkHandlePauseChange(PauseMode prev_mode, PauseMode changed_mode) +{ + if (!_networking) return; + + switch (changed_mode) { + case PM_PAUSED_NORMAL: + case PM_PAUSED_JOIN: + case PM_PAUSED_ACTIVE_CLIENTS: { + bool changed = ((_pause_mode == PM_UNPAUSED) != (prev_mode == PM_UNPAUSED)); + bool paused = (_pause_mode != PM_UNPAUSED); + if (!paused && !changed) return; + + StringID str; + if (!changed) { + int i = -1; + if ((_pause_mode & PM_PAUSED_NORMAL) != PM_UNPAUSED) SetDParam(++i, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL); + if ((_pause_mode & PM_PAUSED_JOIN) != PM_UNPAUSED) SetDParam(++i, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS); + if ((_pause_mode & PM_PAUSED_ACTIVE_CLIENTS) != PM_UNPAUSED) SetDParam(++i, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS); + str = STR_NETWORK_SERVER_MESSAGE_GAME_STILL_PAUSED_1 + i; + } else { + switch (changed_mode) { + case PM_PAUSED_NORMAL: SetDParam(0, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_MANUAL); break; + case PM_PAUSED_JOIN: SetDParam(0, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_CONNECTING_CLIENTS); break; + case PM_PAUSED_ACTIVE_CLIENTS: SetDParam(0, STR_NETWORK_SERVER_MESSAGE_GAME_REASON_NOT_ENOUGH_PLAYERS); break; + default: NOT_REACHED(); + } + str = paused ? STR_NETWORK_SERVER_MESSAGE_GAME_PAUSED : STR_NETWORK_SERVER_MESSAGE_GAME_UNPAUSED; + } + + char buffer[DRAW_STRING_BUFFER]; + GetString(buffer, str, lastof(buffer)); + NetworkTextMessage(NETWORK_ACTION_SERVER_MESSAGE, CC_DEFAULT, false, NULL, buffer); + } break; + + default: + return; + } +} + + /** * Counts the number of active clients connected. * It has to be in STATUS_ACTIVE and not a spectator @@ -380,12 +423,10 @@ static void CheckMinActiveClients() if ((_pause_mode & PM_PAUSED_ACTIVE_CLIENTS) != 0) return; DoCommandP(0, PM_PAUSED_ACTIVE_CLIENTS, 1, CMD_PAUSE); - NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS); } else { if ((_pause_mode & PM_PAUSED_ACTIVE_CLIENTS) == 0) return; DoCommandP(0, PM_PAUSED_ACTIVE_CLIENTS, 0, CMD_PAUSE); - NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS); } } @@ -488,7 +529,6 @@ void NetworkCloseClient(NetworkClientSocket *cs, bool error) /* When the client was PRE_ACTIVE, the server was in pause mode, so unpause */ if (cs->status == STATUS_PRE_ACTIVE && (_pause_mode & PM_PAUSED_JOIN)) { DoCommandP(0, PM_PAUSED_JOIN, 0, CMD_PAUSE); - NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT); } if (_network_server) { diff --git a/src/network/network_func.h b/src/network/network_func.h index d1b9187bc3..e6e6a30fd1 100644 --- a/src/network/network_func.h +++ b/src/network/network_func.h @@ -17,6 +17,7 @@ #include "../console_type.h" #include "../gfx_type.h" #include "../core/smallvec_type.hpp" +#include "../openttd.h" #ifdef ENABLE_NETWORK @@ -56,6 +57,7 @@ bool NetworkCompanyIsPassworded(CompanyID company_id); bool NetworkMaxCompaniesReached(); bool NetworkMaxSpectatorsReached(); void NetworkPrintClients(); +void NetworkHandlePauseChange(PauseMode prev_mode, PauseMode changed_mode); /*** Commands ran by the server ***/ void NetworkServerMonthlyLoop(); diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 887b6da72f..efb005935a 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -832,8 +832,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_MAP_OK) if (_settings_client.network.pause_on_join) { /* Now pause the game till the client is in sync */ DoCommandP(0, PM_PAUSED_JOIN, 1, CMD_PAUSE); - - NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT); } /* also update the new client with our max values */ @@ -1026,7 +1024,6 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_ACK) if (_pause_mode & PM_PAUSED_JOIN) { DoCommandP(0, PM_PAUSED_JOIN, 0, CMD_PAUSE); - NetworkServerSendChat(NETWORK_ACTION_SERVER_MESSAGE, DESTTYPE_BROADCAST, 0, "", CLIENT_ID_SERVER, NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT); } /* Execute script for, e.g. MOTD */ diff --git a/src/network/network_type.h b/src/network/network_type.h index 0daaca0e00..4d5fcee690 100644 --- a/src/network/network_type.h +++ b/src/network/network_type.h @@ -86,15 +86,6 @@ enum NetworkAction { NETWORK_ACTION_COMPANY_NEW, }; -/** Messages the server can give */ -enum NetworkServerMessage { - NETWORK_SERVER_MESSAGE_GAME_PAUSED_PLAYERS, ///< Game paused (not enough players) - NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_PLAYERS, ///< Game unpaused (enough players) - NETWORK_SERVER_MESSAGE_GAME_PAUSED_CONNECT, ///< Game paused (connecting clients) - NETWORK_SERVER_MESSAGE_GAME_UNPAUSED_CONNECT, ///< Game unpaused (no connecting clients) - NETWORK_SERVER_MESSAGE_END -}; - enum NetworkErrorCode { NETWORK_ERROR_GENERAL, // Try to use this one like never