diff --git a/gui.h b/gui.h index 68d385eb39..6b077fe520 100644 --- a/gui.h +++ b/gui.h @@ -124,7 +124,7 @@ extern const byte _fios_colors[]; /* network gui */ void ShowNetworkGameWindow(void); -void ShowChatWindow(StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number); +void ShowChatWindow(int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number); /* bridge_gui.c */ void ShowBuildBridgeWindow(uint start, uint end, byte type); diff --git a/lang/american.txt b/lang/american.txt index 7487395f82..9fccb15089 100644 --- a/lang/american.txt +++ b/lang/american.txt @@ -1309,7 +1309,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Disconnect -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Enter your text message to send STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Enter the amount of money you want to give STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server is protected. Enter password STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Company is protected. Enter password diff --git a/lang/brazilian_portuguese.txt b/lang/brazilian_portuguese.txt index 564a8ebabb..49da6b55dd 100644 --- a/lang/brazilian_portuguese.txt +++ b/lang/brazilian_portuguese.txt @@ -1294,7 +1294,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Desconectar -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Digite a mensagem de texto a enviar STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Digite o valor do dinheiro que pretende dar STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Servidor protegido. Digite a senha STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Companhia protegida. Digite a senha diff --git a/lang/catalan.txt b/lang/catalan.txt index 463377cc23..b7644712ea 100644 --- a/lang/catalan.txt +++ b/lang/catalan.txt @@ -1293,7 +1293,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Desconnecta -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Entra el text del missatge a enviar STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Entra la quantitat de diners que vols obtenir STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Servidor protegit. Entra la contrasenya STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Empresa protegida. Entra la contrasenya diff --git a/lang/czech.txt b/lang/czech.txt index 87f8c42ea1..d1354fc427 100644 --- a/lang/czech.txt +++ b/lang/czech.txt @@ -1350,7 +1350,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Odpojit se -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Napi¨ zprávu, kterou chce¨ poslat STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Napi¨ castku, kterou chce¨ poskytnout STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server je chraneny. Napi¨ heslo STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Spolecnost je chranena. Napi¨ heslo diff --git a/lang/danish.txt b/lang/danish.txt index 0096166a0d..181fbcc274 100644 --- a/lang/danish.txt +++ b/lang/danish.txt @@ -1307,7 +1307,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Afbryd forbindelse -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Skrive den tekst, som du vil sende STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Skriv det belřb, som du řnsker at give STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Serveren er beskyttet. Skriv kodeordet STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Virksomheden er beskyttet. Skriv kodeordet diff --git a/lang/dutch.txt b/lang/dutch.txt index ce8cec2008..9a5e29c144 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1309,7 +1309,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Verbinding verbroken -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Voer het te versturen bericht in STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Voer het geldbedrag dat je wilt geven in STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server is beveiligd. Voer wachtwoord in. STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Bedrijf is beveiligd. Voer wachtwoord in. diff --git a/lang/english.txt b/lang/english.txt index 03880fb726..f30e983b05 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1341,7 +1341,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Disconnect -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Enter your text message to send STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Enter the amount of money you want to give STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server is protected. Enter password STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Company is protected. Enter password diff --git a/lang/estonian.txt b/lang/estonian.txt index b7d9e6535e..c2e718479e 100644 --- a/lang/estonian.txt +++ b/lang/estonian.txt @@ -1290,7 +1290,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Katkesta -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Sőnumi kirjutamine saatmiseks teistele mängijatele STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Teisele mängijale saadetava rahasumma sisestamine STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server on kaitstud. Sisesta parool STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Ettevőte on kaitstud. Sisesta parool diff --git a/lang/finnish.txt b/lang/finnish.txt index 1681d1edcf..fc86a4e80d 100644 --- a/lang/finnish.txt +++ b/lang/finnish.txt @@ -1308,7 +1308,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Pura yhteys -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Syötä lähetettävä teksti STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Syötä annettava rahamäärä STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Palvelin on suojattu. Anna salasana STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Yhtiö on suojattu. Anna salasana diff --git a/lang/french.txt b/lang/french.txt index 2412a7bad7..c3cee57435 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -1312,7 +1312,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Déconnecter -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Saisir le message ŕ envoyer STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Saisir le montant d'argent que vous désirez transférer STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Le serveur est protégé. Entrez le mot de passe STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}La compagnie est protégée. Entrez le mot de passe diff --git a/lang/galician.txt b/lang/galician.txt index dc529be209..a63d2fb980 100644 --- a/lang/galician.txt +++ b/lang/galician.txt @@ -1279,7 +1279,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Desconectar -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Introduce o texto a enviar STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Introduce a cantidade de dińeiro a dar STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}O servidor está protexido. Introduce clave STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}A comańía está protexida. Introduce clave diff --git a/lang/german.txt b/lang/german.txt index 7aff46d099..8284744ac6 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -1310,7 +1310,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Trennen -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Gib deine Nachricht ein STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Gib an, wieviel Geld du geben möchtest STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server ist geschützt. Gib das Passwort ein STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Firma ist geschützt! Passwort eingeben diff --git a/lang/hungarian.txt b/lang/hungarian.txt index f1b3f7c773..bf74c29975 100644 --- a/lang/hungarian.txt +++ b/lang/hungarian.txt @@ -1374,7 +1374,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Lebontás -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Írd be az elküldendő üzenetet STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Írd be mennyi pénzt akarsz adományozni STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}A szerver jelszóval van védve. Írd be STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}A cég jelszóval van védve. Írd be diff --git a/lang/icelandic.txt b/lang/icelandic.txt index 15ad2f4bdc..4488dbf142 100644 --- a/lang/icelandic.txt +++ b/lang/icelandic.txt @@ -1294,7 +1294,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Aftengjast -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Sláđu inn skilabođ til ađ senda STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Sláđu inn upphćđ fjár sem ţú villt gefa STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Ţjónn er varinn. Sláđu inn lykilorđ STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Fyrirtćki er variđ. Sláđu inn lykilorđ diff --git a/lang/italian.txt b/lang/italian.txt index 1a4e465397..f781d77777 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1309,7 +1309,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Disconnessione -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Inserisci il messaggio di testo da inviare STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Inserisci l'ammontare di denaro che vuoi donare STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server protetto. Inserisci la password STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Compagnia protetta. Inserisci la password diff --git a/lang/norwegian.txt b/lang/norwegian.txt index 5d23538445..b02371564f 100644 --- a/lang/norwegian.txt +++ b/lang/norwegian.txt @@ -1292,7 +1292,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Koble fra -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Skriv inn teksten du vil sende STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Skriv inn hvor mange penger du vil gi STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Tjeneren er beskyttet. Skriv inn passord STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Firmaet er beskyttet. Skriv inn passord diff --git a/lang/polish.txt b/lang/polish.txt index 597429732c..344f0b16de 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -1309,7 +1309,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Rozlaczony -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Wprowadz tekst do wyslania STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Wprowadz ilosc pieniedzy jaka chcesz przekazac STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Serwer jest chroniony. Wprowadz haslo STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Firma jest chroniona. Wprowadz haslo diff --git a/lang/portuguese.txt b/lang/portuguese.txt index 8d167a14e3..06fa8938ab 100644 --- a/lang/portuguese.txt +++ b/lang/portuguese.txt @@ -1294,7 +1294,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Desligar -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Introduza a mensagem de texto a enviar STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Introduza o valor do dinheiro que pretende dar STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Servidor protegido. Introduza palavra-chave STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Companhia protegida. Introduza palavra-chave diff --git a/lang/romanian.txt b/lang/romanian.txt index cec844f0c5..3bf54c1330 100644 --- a/lang/romanian.txt +++ b/lang/romanian.txt @@ -1294,7 +1294,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Deconectare -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Introdu textul de trimis STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Introdu suma de bani pe care vrei sa o cedezi STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server protejat. Introdu parola STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Companie protejata. Introdu parola diff --git a/lang/slovak.txt b/lang/slovak.txt index f965c737a7..e39e5d7fa5 100644 --- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -1300,7 +1300,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Odpojit sa -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Napis spravu, ktoru chces poslat STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Napis sumu, ktoru chces poskytnut STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Server je chraneny. Napis heslo STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Spolocnost je chranena. Napis heslo diff --git a/lang/spanish.txt b/lang/spanish.txt index a0a9d3d79f..afff952a69 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -1294,7 +1294,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Desconectado -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Teclee el mensaje de texto a enviar STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Introduce la cantidad de dinero que desea dar STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Servidor protegido. Teclee la contraseńa STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Empresa protegida. Introduce contraseńa diff --git a/lang/swedish.txt b/lang/swedish.txt index 295a6bd537..d12748e9db 100644 --- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -1309,7 +1309,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Frĺnkopplad -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Ange meddelandet du vill skicka STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Ange beloppet du vill ge STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Servern är skyddad. Ange lösenord STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Företaget är skyddat. Ange lösenord diff --git a/lang/turkish.txt b/lang/turkish.txt index 1732993674..3975f5052d 100644 --- a/lang/turkish.txt +++ b/lang/turkish.txt @@ -1309,7 +1309,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Baglantiyi kes -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Göndereceginiz mesaji girin STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Vereceginiz para miktarini girin STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Sunucu korumali. Parola girin STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Sirket korumali. Parola girin diff --git a/lang/unfinished/lithuanian.txt b/lang/unfinished/lithuanian.txt index 26cca0e413..d0f993d566 100644 --- a/lang/unfinished/lithuanian.txt +++ b/lang/unfinished/lithuanian.txt @@ -1248,7 +1248,6 @@ STR_NETWORK_CONNECTING_DOWNLOADING :{BLACK}{NUM} / STR_NETWORK_DISCONNECT :{BLACK}Atsijungti -STR_NETWORK_CHAT_QUERY_CAPTION :{WHITE}Ivesk teksta kuri nori siusti STR_NETWORK_GIVE_MONEY_CAPTION :{WHITE}Ivesk pinigu kieki kuri nori duoti STR_NETWORK_NEED_GAME_PASSWORD_CAPTION :{WHITE}Serveris apsaugotas. Ivesk slaptazodi STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION :{WHITE}Kompanija apsaugota. Ivesk slaptazodi diff --git a/main_gui.c b/main_gui.c index a0fcf56528..9fdc1d4e3b 100644 --- a/main_gui.c +++ b/main_gui.c @@ -332,7 +332,7 @@ void ShowNetworkChatQueryWindow(byte desttype, byte dest) { _rename_id = desttype + (dest << 8); _rename_what = 2; - ShowChatWindow(STR_NETWORK_CHAT_QUERY_CAPTION, 150, 338, 1, 0); + ShowChatWindow(150, 338, 1, 0); } void ShowNetworkGiveMoneyWindow(byte player) diff --git a/network_gui.c b/network_gui.c index 92444572d2..c29151d804 100644 --- a/network_gui.c +++ b/network_gui.c @@ -1545,7 +1545,7 @@ static const WindowDesc _chat_window_desc = { ChatWindowWndProc }; -void ShowChatWindow(StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number) +void ShowChatWindow(int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number) { Window *w; @@ -1556,7 +1556,7 @@ void ShowChatWindow(StringID caption, int maxlen, int maxwidth, WindowClass wind w = AllocateWindowDesc(&_chat_window_desc); w->click_state = 1 << 1; - WP(w,querystr_d).caption = caption; + WP(w,querystr_d).caption = STR_NULL; WP(w,querystr_d).wnd_class = window_class; WP(w,querystr_d).wnd_num = window_number; WP(w,querystr_d).text.caret = false;