diff options
| -rw-r--r-- | gui.h | 2 | ||||
| -rw-r--r-- | main_gui.c | 2 | ||||
| -rw-r--r-- | network_gui.c | 17 |
3 files changed, 6 insertions, 15 deletions
@@ -124,7 +124,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(StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number); /* bridge_gui.c */ void ShowBuildBridgeWindow(uint start, uint end, byte type); diff --git a/main_gui.c b/main_gui.c index 3e9fbd908..a0fcf5652 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_EMPTY, STR_NETWORK_CHAT_QUERY_CAPTION, 150, 338, 1, 0); + ShowChatWindow(STR_NETWORK_CHAT_QUERY_CAPTION, 150, 338, 1, 0); } void ShowNetworkGiveMoneyWindow(byte player) diff --git a/network_gui.c b/network_gui.c index c1a3abe72..92444572d 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,9 +1463,6 @@ void ShowJoinStatusWindowAfterJoin(void) } - -#define MAX_QUERYSTR_LEN 64 - /* uses querystr_d WP macro */ static void ChatWindowWndProc(Window *w, WindowEvent *e) { @@ -1485,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; @@ -1548,19 +1545,13 @@ 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(StringID caption, int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number) { 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); |