1
0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 04:29:09 +00:00

(svn r13027) -Codechange: use StrEmpty instead of arr[0] == '\0' and remove the need for WE_ON_EDIT_TEXT_CANCEL.

This commit is contained in:
rubidium
2008-05-10 08:58:52 +00:00
parent e099831210
commit f23026cce8
12 changed files with 32 additions and 21 deletions

View File

@@ -579,8 +579,10 @@ static void NetworkGameWindowWndProc(Window *w, WindowEvent *e)
break;
case WE_ON_EDIT_TEXT:
NetworkAddServer(e->we.edittext.str);
NetworkRebuildHostList();
if (!StrEmpty(e->we.edittext.str)) {
NetworkAddServer(e->we.edittext.str);
NetworkRebuildHostList();
}
break;
case WE_RESIZE: {
@@ -917,7 +919,7 @@ static void NetworkStartServerWindowWndProc(Window *w, WindowEvent *e)
if (nd->widget_id == NSSW_SETPWD) {
ttd_strlcpy(_network_server_password, e->we.edittext.str, lengthof(_network_server_password));
_network_game_info.use_password = (_network_server_password[0] != '\0');
_network_game_info.use_password = !StrEmpty(_network_server_password);
} else {
int32 value = atoi(e->we.edittext.str);
w->InvalidateWidget(nd->widget_id);
@@ -1673,15 +1675,14 @@ static void NetworkJoinStatusWindowWndProc(Window *w, WindowEvent *e)
}
break;
/* If the server asks for a password, we need to fill it in */
case WE_ON_EDIT_TEXT_CANCEL:
case WE_ON_EDIT_TEXT:
if (StrEmpty(e->we.edittext.str)) {
NetworkDisconnect();
ShowNetworkGameWindow();
break;
case WE_ON_EDIT_TEXT:
} else {
SEND_COMMAND(PACKET_CLIENT_PASSWORD)(pw_type, e->we.edittext.str);
break;
}
break;
}
}