From 2e0498dce05b59a8e7a9e99d7508932a9227c993 Mon Sep 17 00:00:00 2001 From: peter1138 Date: Thu, 29 Jun 2006 08:58:08 +0000 Subject: [PATCH] (svn r5427) - Codechange: testing for "== true" is redundant. --- aircraft_cmd.c | 2 +- roadveh_cmd.c | 2 +- ship_cmd.c | 2 +- train_cmd.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aircraft_cmd.c b/aircraft_cmd.c index 37d3ee6083..a5a93770f7 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -223,7 +223,7 @@ int32 CmdBuildAircraft(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) return_cmd_error(STR_AIRPORT_HAS_NO_RUNWAY); } - unit_num = (HASBIT(p2, 0) == true) ? 0 : GetFreeUnitNumber(VEH_Aircraft); + unit_num = HASBIT(p2, 0) ? 0 : GetFreeUnitNumber(VEH_Aircraft); if (unit_num > _patches.max_aircraft) return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); diff --git a/roadveh_cmd.c b/roadveh_cmd.c index d0a3c0a931..ee9f9cec11 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -128,7 +128,7 @@ int32 CmdBuildRoadVeh(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); /* find the first free roadveh id */ - unit_num = (HASBIT(p2, 0) == true) ? 0 : GetFreeUnitNumber(VEH_Road); + unit_num = HASBIT(p2, 0) ? 0 : GetFreeUnitNumber(VEH_Road); if (unit_num > _patches.max_roadveh) return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); diff --git a/ship_cmd.c b/ship_cmd.c index 85fdbef99d..009d243fa9 100644 --- a/ship_cmd.c +++ b/ship_cmd.c @@ -850,7 +850,7 @@ int32 CmdBuildShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (!IsTileOwner(tile, _current_player)) return CMD_ERROR; v = AllocateVehicle(); - unit_num = (HASBIT(p2, 0) == true) ? 0 : GetFreeUnitNumber(VEH_Ship); + unit_num = HASBIT(p2, 0) ? 0 : GetFreeUnitNumber(VEH_Ship); if (v == NULL || IsOrderPoolFull() || unit_num > _patches.max_ships) return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME); diff --git a/train_cmd.c b/train_cmd.c index 7becdb023d..0fa6cebc9e 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -742,7 +742,7 @@ int32 CmdBuildRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) v = vl[0]; - unit_num = (HASBIT(p2, 0) == true) ? 0 : GetFreeUnitNumber(VEH_Train); + unit_num = HASBIT(p2, 0) ? 0 : GetFreeUnitNumber(VEH_Train); if (unit_num > _patches.max_trains) return_cmd_error(STR_00E1_TOO_MANY_VEHICLES_IN_GAME);