diff --git a/gui.h b/gui.h index 960b2741ad..9951218fd4 100644 --- a/gui.h +++ b/gui.h @@ -123,7 +123,7 @@ extern const byte _fios_colors[]; /* network gui */ void ShowNetworkGameWindow(void); -void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number); +void ShowChatWindow(void); /* bridge_gui.c */ void ShowBuildBridgeWindow(uint start, uint end, byte type); diff --git a/lang/american.txt b/lang/american.txt index 61b921eb6c..a07ccc2330 100644 --- a/lang/american.txt +++ b/lang/american.txt @@ -1313,7 +1313,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 2359330821..49d9e9d834 100644 --- a/lang/brazilian_portuguese.txt +++ b/lang/brazilian_portuguese.txt @@ -1298,7 +1298,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 31783d1d05..7382d7fee5 100644 --- a/lang/catalan.txt +++ b/lang/catalan.txt @@ -1297,7 +1297,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 a8ae437941..7c766e4f4d 100644 --- a/lang/czech.txt +++ b/lang/czech.txt @@ -1354,7 +1354,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 39ad8ba9e0..c8bc054460 100644 --- a/lang/danish.txt +++ b/lang/danish.txt @@ -1311,7 +1311,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 5bd3ee8f5b..545d371f9c 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1313,7 +1313,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 624ae0799e..81909a6e66 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1313,7 +1313,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 6e04744bbb..0e317394de 100644 --- a/lang/estonian.txt +++ b/lang/estonian.txt @@ -1294,7 +1294,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 650f7219c8..1e9ddebf00 100644 --- a/lang/finnish.txt +++ b/lang/finnish.txt @@ -1312,7 +1312,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 a02b8727e8..6d78194eb8 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -1314,7 +1314,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 4607f839f1..315c4f6377 100644 --- a/lang/galician.txt +++ b/lang/galician.txt @@ -1283,7 +1283,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 1f53fd18fb..74e3dce03d 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -1314,7 +1314,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 40e4c8b59f..189d942c77 100644 --- a/lang/hungarian.txt +++ b/lang/hungarian.txt @@ -1378,7 +1378,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 2f0128a0a3..544c6f2e78 100644 --- a/lang/icelandic.txt +++ b/lang/icelandic.txt @@ -1298,7 +1298,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 9121f36716..38e37a3e77 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1313,7 +1313,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 1c47a28bd1..fcfe66b4e2 100644 --- a/lang/norwegian.txt +++ b/lang/norwegian.txt @@ -1296,7 +1296,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 55580b033f..d94af7225e 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -1313,7 +1313,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 87d9dff569..5080f04af6 100644 --- a/lang/portuguese.txt +++ b/lang/portuguese.txt @@ -1298,7 +1298,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 546f4e8eba..d3670bf190 100644 --- a/lang/romanian.txt +++ b/lang/romanian.txt @@ -1298,7 +1298,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 b248f6412b..fc89ac23a9 100644 --- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -1304,7 +1304,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 f8c120d8ce..1a56f661a3 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -1298,7 +1298,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 9fed2899c6..054aa63f83 100644 --- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -1313,7 +1313,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 4f313e5755..c252bbf8de 100644 --- a/lang/turkish.txt +++ b/lang/turkish.txt @@ -1313,7 +1313,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 9d55ccfdda..eaf17f75b2 100644 --- a/main_gui.c +++ b/main_gui.c @@ -331,7 +331,7 @@ void ShowNetworkChatQueryWindow(byte desttype, byte dest) { _rename_id = desttype + (dest << 8); _rename_what = 2; - ShowChatWindow(STR_EMPTY, STR_NETWORK_CHAT_QUERY_CAPTION, 150, 338, 1, 0); + ShowChatWindow(); } void ShowNetworkGiveMoneyWindow(byte player) diff --git a/network_gui.c b/network_gui.c index 1942154df7..0a80c97c52 100644 --- a/network_gui.c +++ b/network_gui.c @@ -51,7 +51,7 @@ typedef struct NetworkGameSorting { /* Global to remember sorting after window has been closed */ static NetworkGameSorting _ng_sorting; -static char _edit_str_buf[MAX_QUERYSTR_LEN*2]; +static char _edit_str_buf[MAX_QUERYSTR_LEN]; static void ShowNetworkStartServerWindow(void); static void ShowNetworkLobbyWindow(NetworkGameList *ngl); @@ -1463,19 +1463,13 @@ void ShowJoinStatusWindowAfterJoin(void) } - -#define MAX_QUERYSTR_LEN 64 - /* uses querystr_d WP macro */ static void ChatWindowWndProc(Window *w, WindowEvent *e) { - static bool closed = false; - switch (e->event) { case WE_CREATE: SendWindowMessage(WC_NEWS_WINDOW, 0, WE_CREATE, w->height, 0); SETBIT(_no_scroll, SCROLL_CHAT); // do not scroll the game with the arrow-keys - closed = false; break; case WE_PAINT: @@ -1488,7 +1482,7 @@ static void ChatWindowWndProc(Window *w, WindowEvent *e) case 3: DeleteWindow(w); break; // Cancel case 2: // Send press_ok:; - if (strcmp(WP(w, querystr_d).text.buf, WP(w, querystr_d).text.buf + MAX_QUERYSTR_LEN) == 0) { + if (WP(w, querystr_d).text.buf[0] == '\0') { DeleteWindow(w); } else { char *buf = WP(w, querystr_d).text.buf; @@ -1496,9 +1490,6 @@ press_ok:; WindowNumber wnd_num = WP(w, querystr_d).wnd_num; Window *parent; - // Mask the edit-box as closed, so we don't send out a CANCEL - closed = true; - DeleteWindow(w); parent = FindWindowById(wnd_class, wnd_num); @@ -1534,15 +1525,6 @@ press_ok:; case WE_DESTROY: SendWindowMessage(WC_NEWS_WINDOW, 0, WE_DESTROY, 0, 0); CLRBIT(_no_scroll, SCROLL_CHAT); - // If the window is not closed yet, it means it still needs to send a CANCEL - if (!closed) { - Window *parent = FindWindowById(WP(w,querystr_d).wnd_class, WP(w,querystr_d).wnd_num); - if (parent != NULL) { - WindowEvent e; - e.event = WE_ON_EDIT_TEXT_CANCEL; - parent->wndproc(parent, &e); - } - } break; } } @@ -1563,29 +1545,23 @@ static const WindowDesc _chat_window_desc = { ChatWindowWndProc }; -void ShowChatWindow(StringID str, StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number) +void ShowChatWindow(void) { Window *w; -#define _orig_edit_str_buf (_edit_str_buf+MAX_QUERYSTR_LEN) - DeleteWindowById(WC_SEND_NETWORK_MSG, 0); - GetString(_orig_edit_str_buf, str); - - _orig_edit_str_buf[maxlen] = '\0'; - - memcpy(_edit_str_buf, _orig_edit_str_buf, MAX_QUERYSTR_LEN); + _edit_str_buf[0] = '\0'; w = AllocateWindowDesc(&_chat_window_desc); w->click_state = 1 << 1; - WP(w,querystr_d).caption = caption; - WP(w,querystr_d).wnd_class = window_class; - WP(w,querystr_d).wnd_num = window_number; + WP(w,querystr_d).caption = STR_NULL; + WP(w,querystr_d).wnd_class = WC_MAIN_TOOLBAR; + WP(w,querystr_d).wnd_num = 0; WP(w,querystr_d).text.caret = false; - WP(w,querystr_d).text.maxlength = maxlen - 1; - WP(w,querystr_d).text.maxwidth = maxwidth; + WP(w,querystr_d).text.maxlength = lengthof(_edit_str_buf); + WP(w,querystr_d).text.maxwidth = w->widget[1].right - w->widget[1].left - 2; // widget[1] is the "text box" WP(w,querystr_d).text.buf = _edit_str_buf; UpdateTextBufferSize(&WP(w, querystr_d).text); }