From 4a14a586e2f457d38e9fede1a494478105a8acfd Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 13 Nov 2005 14:54:09 +0000 Subject: (svn r3173) Use the trinary operator and switch to improve readability Also align short cases nicely --- vehicle.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'vehicle.c') diff --git a/vehicle.c b/vehicle.c index 309a21e08..542d2b99d 100644 --- a/vehicle.c +++ b/vehicle.c @@ -109,14 +109,12 @@ bool VehicleNeedsService(const Vehicle *v) void VehicleInTheWayErrMsg(const Vehicle* v) { - StringID id; - - (id = STR_8803_TRAIN_IN_THE_WAY,v->type == VEH_Train) || - (id = STR_9000_ROAD_VEHICLE_IN_THE_WAY,v->type == VEH_Road) || - (id = STR_A015_AIRCRAFT_IN_THE_WAY,v->type == VEH_Aircraft) || - (id = STR_980E_SHIP_IN_THE_WAY, true); - - _error_message = id; + switch (v->type) { + case VEH_Train: _error_message = STR_8803_TRAIN_IN_THE_WAY; break; + case VEH_Road: _error_message = STR_9000_ROAD_VEHICLE_IN_THE_WAY; break; + case VEH_Aircraft: _error_message = STR_A015_AIRCRAFT_IN_THE_WAY; break; + default: _error_message = STR_980E_SHIP_IN_THE_WAY; break; + } } static void *EnsureNoVehicleProc(Vehicle *v, void *data) -- cgit v1.2.3-54-g00ecf