cpp/openttd-patchpack/source Changeset - r1899:6cfe24763317

Changeset - r1899:6cfe24763317

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

tron - 19 years ago 2005-06-04 07:35:12
tron@openttd.org

(svn r2405) Simplify a few '? true : false' and '? false : true', especially the latter is confusing

5 files changed with 8 insertions and 8 deletions:

console.c

network.c

network_gui.c

unix.c

win32.c

0 comments (0 inline, 0 general)

console.c

➞

Show inline comments

@@ @@ -473,7 +473,7 @@ bool GetArgumentInteger(uint32 *value, c @@
+	}
 	*value = strtoul(arg, &endptr, 0);
-	return (arg == endptr) ? false : true;
+	return arg != endptr;
+}
 // * ************************* * //

network.c

➞

Show inline comments

@@ @@ -925,7 +925,7 @@ static void NetworkInitGameInfo(void) @@
 	_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)

network_gui.c

➞

Show inline comments

@@ @@ -488,7 +488,7 @@ static void NetworkStartServerWindowWndP @@
 	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 @@ static void NetworkStartServerWindowWndP @@
 	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 @@ static void NetworkStartServerWindowWndP @@
 	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;
+	}

unix.c

➞

Show inline comments

@@ @@ -559,7 +559,7 @@ bool InsertTextBufferClipboard(Textbuf * @@
 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;}

win32.c

➞

Show inline comments

@@ @@ -2251,7 +2251,7 @@ bool CreateOTTDThread(void *func, void * @@
 	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 @@ void JoinOTTDThread(void) @@
 	if (hThread == NULL) return;
 	WaitForSingleObject(hThread, INFINITE);
+}
@@ \ No newline at end of file @@
+}

0 comments (0 inline, 0 general)