cpp/openttd-patchpack/source Changeset - r13212:b51a03c020a0

Changeset - r13212:b51a03c020a0

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 15 years ago 2009-10-06 19:56:43
frosch@openttd.org

(svn r17729) -Cleanup: Deduplicate some code.

1 file changed with 22 insertions and 28 deletions:

src/build_vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/build_vehicle_gui.cpp

➞

Show inline comments

@@ @@ -629,53 +629,47 @@ int DrawVehiclePurchaseInfo(int left, in @@
 	YearMonthDay ymd;
 	ConvertDateToYMD(e->intro_date, &ymd);
 	bool refittable = IsArticulatedVehicleRefittable(engine_number);
 	bool articulated_cargo = false;
 	switch (e->type) {
 		default: NOT_REACHED();
-		case VEH_TRAIN: {
 		case VEH_TRAIN:
 			if (e->u.rail.railveh_type == RAILVEH_WAGON) {
 				y = DrawRailWagonPurchaseInfo(left, right, y, engine_number, &e->u.rail);
 			} else {
 				y = DrawRailEnginePurchaseInfo(left, right, y, engine_number, &e->u.rail);
+			}
 			/* Cargo type + capacity, or N/A */
 			int new_y = DrawCargoCapacityInfo(left, right, y, engine_number, refittable);
 			if (new_y == y) {
 				SetDParam(0, CT_INVALID);
 				SetDParam(2, STR_EMPTY);
 				DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY);
 				y += FONT_HEIGHT_NORMAL;
 			} else {
 				y = new_y;
+			}
 			articulated_cargo = true;
 			break;
+		}
 		case VEH_ROAD: {
 			y = DrawRoadVehPurchaseInfo(left, right, y, engine_number);
 			/* Cargo type + capacity, or N/A */
 			int new_y = DrawCargoCapacityInfo(left, right, y, engine_number, refittable);
 			if (new_y == y) {
 				SetDParam(0, CT_INVALID);
 				SetDParam(2, STR_EMPTY);
 				DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY);
 				y += FONT_HEIGHT_NORMAL;
 			} else {
 				y = new_y;
+			}
 		case VEH_ROAD:
 			y = DrawRoadVehPurchaseInfo(left, right, y, engine_number);
 			articulated_cargo = true;
 			break;
+		}
 		case VEH_SHIP:
 			y = DrawShipPurchaseInfo(left, right, y, engine_number, &e->u.ship, refittable);
 			break;
 		case VEH_AIRCRAFT:
 			y = DrawAircraftPurchaseInfo(left, right, y, engine_number, &e->u.air, refittable);
 			break;
+	}
 	if (articulated_cargo) {
 		/* Cargo type + capacity, or N/A */
 		int new_y = DrawCargoCapacityInfo(left, right, y, engine_number, refittable);
 		if (new_y == y) {
 			SetDParam(0, CT_INVALID);
 			SetDParam(2, STR_EMPTY);
 			DrawString(left, right, y, STR_PURCHASE_INFO_CAPACITY);
 			y += FONT_HEIGHT_NORMAL;
 		} else {
 			y = new_y;
+		}
+	}
 	/* Draw details, that applies to all types except rail wagons */
 	if (e->type != VEH_TRAIN || e->u.rail.railveh_type != RAILVEH_WAGON) {
 		/* Design date - Life length */

0 comments (0 inline, 0 general)