Mercurial > hg > openttd

changeset 4519:7449f6656bd9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r6304) -Codechange r6295: Use !! instead of (bool) in commands to send vehicles to depots
author bjarni <bjarni@openttd.org>
date Sat, 02 Sep 2006 09:35:03 +0000
parents 6a05af3cf20f
children ff39751c50c3
files aircraft_cmd.c roadveh_cmd.c ship_cmd.c train_cmd.c
diffstat 4 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -512,7 +512,7 @@
 	if (v->type != VEH_Aircraft || !CheckOwnership(v->owner)) return CMD_ERROR;
 
 	if (v->current_order.type == OT_GOTO_DEPOT && !(p2 & DEPOT_LOCATE_HANGAR)) {
-		if ((p2 & DEPOT_SERVICE) == (bool)HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
+		if (!!(p2 & DEPOT_SERVICE) == HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
 			/* We called with a different DEPOT_SERVICE setting.
 			 * Now we change the setting to apply the new one and let the vehicle head for the same hangar.
 			 * Note: the if is (true for requesting service == true for ordered to stop in hangar)          */
--- a/roadveh_cmd.c
+++ b/roadveh_cmd.c
@@ -382,7 +382,7 @@
 
 	/* If the current orders are already goto-depot */
 	if (v->current_order.type == OT_GOTO_DEPOT) {
-		if ((p2 & DEPOT_SERVICE) == (bool)HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
+		if (!!(p2 & DEPOT_SERVICE) == HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
 			/* We called with a different DEPOT_SERVICE setting.
 			* Now we change the setting to apply the new one and let the vehicle head for the same depot.
 			* Note: the if is (true for requesting service == true for ordered to stop in depot)          */
--- a/ship_cmd.c
+++ b/ship_cmd.c
@@ -1020,7 +1020,7 @@
 
 	/* If the current orders are already goto-depot */
 	if (v->current_order.type == OT_GOTO_DEPOT) {
-		if ((p2 & DEPOT_SERVICE) == (bool)HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
+		if (!!(p2 & DEPOT_SERVICE) == HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
 			/* We called with a different DEPOT_SERVICE setting.
 			 * Now we change the setting to apply the new one and let the vehicle head for the same depot.
 			 * Note: the if is (true for requesting service == true for ordered to stop in depot)          */
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -1948,7 +1948,7 @@
 	if (v->vehstatus & VS_CRASHED) return CMD_ERROR;
 
 	if (v->current_order.type == OT_GOTO_DEPOT) {
-		if ((p2 & DEPOT_SERVICE) == (bool)HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
+		if (!!(p2 & DEPOT_SERVICE) == HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT)) {
 			/* We called with a different DEPOT_SERVICE setting.
 			* Now we change the setting to apply the new one and let the vehicle head for the same depot.
 			* Note: the if is (true for requesting service == true for ordered to stop in depot)          */