Mercurial > hg > openttd
changeset 1899:62b9262e06a4 draft
(svn r2405) Simplify a few '? true : false' and '? false : true', especially the latter is confusing
author | tron <tron@openttd.org> |
---|---|
date | Sat, 04 Jun 2005 07:35:12 +0000 |
parents | 409022207f16 |
children | f528689f3d83 |
files | console.c network.c network_gui.c unix.c win32.c |
diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/console.c +++ b/console.c @@ -473,7 +473,7 @@ } *value = strtoul(arg, &endptr, 0); - return (arg == endptr) ? false : true; + return arg != endptr; } // * ************************* * //
--- a/network.c +++ b/network.c @@ -925,7 +925,7 @@ _network_game_info.map_height = MapSizeY(); _network_game_info.map_set = _opt.landscape; - _network_game_info.use_password = (_network_server_password[0] == '\0') ? 0 : 1; + _network_game_info.use_password = (_network_server_password[0] != '\0'); // We use _network_client_info[MAX_CLIENT_INFO - 1] to store the server-data in it // The index is NETWORK_SERVER_INDEX ( = 1)
--- a/network_gui.c +++ b/network_gui.c @@ -488,7 +488,7 @@ switch (e->event) { case WE_CREATE: /* focus input box */ _selected_field = 3; - _network_game_info.use_password = (_network_server_password[0] == '\0') ? 0 : 1; + _network_game_info.use_password = (_network_server_password[0] != '\0'); break; case WE_PAINT: { @@ -591,7 +591,7 @@ case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */ switch(e->dropdown.button) { case 8: - _network_advertise = (e->dropdown.index == 0) ? false : true; + _network_advertise = (e->dropdown.index != 0); break; case 10: _network_game_info.clients_max = e->dropdown.index + 2; @@ -617,7 +617,7 @@ case WE_ON_EDIT_TEXT: { const char *b = e->edittext.str; ttd_strlcpy(_network_server_password, b, sizeof(_network_server_password)); - _network_game_info.use_password = (_network_server_password[0] == '\0') ? 0 : 1; + _network_game_info.use_password = (_network_server_password[0] != '\0'); SetWindowDirty(w); } break; }
--- a/unix.c +++ b/unix.c @@ -559,7 +559,7 @@ static pthread_t thread1 = 0; bool CreateOTTDThread(void *func, void *param) { - return (pthread_create(&thread1, NULL, func, param) == 0) ? true : false; + return pthread_create(&thread1, NULL, func, param) == 0; } void CloseOTTDThread(void) {return;}
--- a/win32.c +++ b/win32.c @@ -2251,7 +2251,7 @@ hThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)func, param, 0, &dwThreadId); SetThreadPriority(hThread, THREAD_PRIORITY_BELOW_NORMAL); - return (hThread == NULL) ? false : true; + return hThread != NULL; } void CloseOTTDThread(void) @@ -2264,4 +2264,4 @@ if (hThread == NULL) return; WaitForSingleObject(hThread, INFINITE); -} \ No newline at end of file +}