Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r4315) Remove MAX_QUERYSTR_LEN, rather use lengthof() the real thing

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
tron 19 years ago
parent 10454a6dd1
commit 1440451a6b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

16
network_gui.c
Unescape Escape View File

@ -25,7 +25,6 @@
#define BGC 5 #define BGC 5
#define BTC 15 #define BTC 15
#define MAX_QUERYSTR_LEN 64
typedef struct network_d { typedef struct network_d {
byte company; // select company in network lobby byte company; // select company in network lobby
@ -51,7 +50,8 @@ typedef struct NetworkGameSorting {
/* Global to remember sorting after window has been closed */ /* Global to remember sorting after window has been closed */
static NetworkGameSorting _ng_sorting; static NetworkGameSorting _ng_sorting;
static char _edit_str_buf[MAX_QUERYSTR_LEN]; static char _edit_str_buf[64];
static void ShowNetworkStartServerWindow(void); static void ShowNetworkStartServerWindow(void);
static void ShowNetworkLobbyWindow(NetworkGameList *ngl); static void ShowNetworkLobbyWindow(NetworkGameList *ngl);
@ -544,7 +544,6 @@ void ShowNetworkGameWindow(void)
{ {
static bool first = true; static bool first = true;
Window *w; Window *w;
querystr_d *querystr;
DeleteWindowById(WC_NETWORK_WINDOW, 0); DeleteWindowById(WC_NETWORK_WINDOW, 0);
/* Only show once */ /* Only show once */
@ -563,12 +562,13 @@ void ShowNetworkGameWindow(void)
w = AllocateWindowDesc(&_network_game_window_desc); w = AllocateWindowDesc(&_network_game_window_desc);
if (w != NULL) { if (w != NULL) {
querystr = &WP(w, network_ql_d).q; querystr_d* querystr = &WP(w, network_ql_d).q;
ttd_strlcpy(_edit_str_buf, _network_player_name, MAX_QUERYSTR_LEN);
ttd_strlcpy(_edit_str_buf, _network_player_name, lengthof(_edit_str_buf));
w->vscroll.cap = 12; w->vscroll.cap = 12;
querystr->text.caret = true; querystr->text.caret = true;
querystr->text.maxlength = MAX_QUERYSTR_LEN; querystr->text.maxlength = lengthof(_edit_str_buf);
querystr->text.maxwidth = 120; querystr->text.maxwidth = 120;
querystr->text.buf = _edit_str_buf; querystr->text.buf = _edit_str_buf;
UpdateTextBufferSize(&querystr->text); UpdateTextBufferSize(&querystr->text);
@ -774,7 +774,7 @@ static void ShowNetworkStartServerWindow(void)
DeleteWindowById(WC_NETWORK_WINDOW, 0); DeleteWindowById(WC_NETWORK_WINDOW, 0);
w = AllocateWindowDesc(&_network_start_server_window_desc); w = AllocateWindowDesc(&_network_start_server_window_desc);
ttd_strlcpy(_edit_str_buf, _network_server_name, MAX_QUERYSTR_LEN); ttd_strlcpy(_edit_str_buf, _network_server_name, lengthof(_edit_str_buf));
_saveload_mode = SLD_NEW_GAME; _saveload_mode = SLD_NEW_GAME;
BuildFileList(); BuildFileList();
@ -782,7 +782,7 @@ static void ShowNetworkStartServerWindow(void)
w->vscroll.count = _fios_num+1; w->vscroll.count = _fios_num+1;
WP(w, network_ql_d).q.text.caret = true; WP(w, network_ql_d).q.text.caret = true;
WP(w, network_ql_d).q.text.maxlength = MAX_QUERYSTR_LEN; WP(w, network_ql_d).q.text.maxlength = lengthof(_edit_str_buf);
WP(w, network_ql_d).q.text.maxwidth = 160; WP(w, network_ql_d).q.text.maxwidth = 160;
WP(w, network_ql_d).q.text.buf = _edit_str_buf; WP(w, network_ql_d).q.text.buf = _edit_str_buf;
UpdateTextBufferSize(&WP(w, network_ql_d).q.text); UpdateTextBufferSize(&WP(w, network_ql_d).q.text);

Write Preview
Loading…
Cancel
Save