openttd-mini: comparison train

equal deleted inserted replaced

-:a6650b616430
+:d4d440dd8925
 void CcBuildWagon(bool success, TileIndex tile, uint32 p1, uint32 p2)
 {
 	Vehicle *v,*found;
-	if (!success)
+	if (!success) return;
-		return;
 	// find a locomotive in the depot.
 	found = NULL;
 	FOR_ALL_VEHICLES(v) {
 		if (v->type == VEH_Train && IsFrontEngine(v) &&
 				v->tile == tile &&
 				v->u.rail.track == 0x80) {
-			if (found != NULL) // must be exactly one.
+			if (found != NULL) return; // must be exactly one.
-				return;
 			found = v;
 		}
 	}
 	// if we found a loco,
 		if (!HasPowerOnRail(e->railtype, railtype) || !(rvi->flags & RVI_WAGON) != is_engine ||
 				!HASBIT(e->player_avail, _local_player))
 			continue;
-		if (*sel == 0)
+		if (*sel == 0) *selected_id = i;
-			*selected_id = i;
 		if (IS_INT_INSIDE(--*pos, -show_max, 0)) {
 			DrawString(*x + 59, *y + 2, GetCustomEngineName(i), *sel == 0 ? 0xC : 0x10);
 			DrawTrainEngine(*x + 29, *y + 6, i, GetEnginePalette(i, _local_player));
 			*y += 14;
 static void NewRailVehicleWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
 	case WE_PAINT:
-		if (w->window_number == 0)
+		if (w->window_number == 0) SETBIT(w->disabled_state, 5);
-			SETBIT(w->disabled_state, 5);
 		{
 			int count = 0;
 			RailType railtype = WP(w,buildtrain_d).railtype;
 			EngineID i;
 			for (i = 0; i < NUM_TRAIN_ENGINES; i++) {
 				const Engine *e = GetEngine(i);
-				if (HasPowerOnRail(e->railtype, railtype)
+				if (HasPowerOnRail(e->railtype, railtype) &&
-				    && HASBIT(e->player_avail, _local_player))
+						HASBIT(e->player_avail, _local_player)) {
 					count++;
+				}
 			}
 			SetVScrollCount(w, count);
 		}
 		SetDParam(0, WP(w,buildtrain_d).railtype + STR_881C_NEW_RAIL_VEHICLES);
 	/* determine amount of items for scroller */
 	num = 0;
 	hnum = 8;
 	FOR_ALL_VEHICLES(v) {
 		if (v->type == VEH_Train &&
-			  (IsFrontEngine(v) || IsFreeWagon(v)) &&
+				(IsFrontEngine(v) || IsFreeWagon(v)) &&
 				v->tile == tile &&
 				v->u.rail.track == 0x80) {
 			num++;
 			// determine number of items in the X direction.
 			if (IsFrontEngine(v)) {
 {
 	Vehicle *v;
 	v = GetVehicle(sel);
-	if (v == wagon)
+	if (v == wagon) return;
-		return;
 	if (wagon == NULL) {
-		if (head != NULL)
+		if (head != NULL) wagon = GetLastVehicleInChain(head);
-			wagon = GetLastVehicleInChain(head);
 	} else  {
 		wagon = GetPrevVehicleInChain(wagon);
-		if (wagon == NULL)
+		if (wagon == NULL) return;
-			return;
+	}
-	}
+	if (wagon == v) return;
-	if (wagon == v)
-		return;
 	DoCommandP(v->tile, v->index + ((wagon == NULL ? INVALID_VEHICLE : wagon->index) << 16), _ctrl_pressed ? 1 : 0, NULL, CMD_MOVE_RAIL_VEHICLE | CMD_MSG(STR_8837_CAN_T_MOVE_VEHICLE));
 }
 static void TrainDepotClickTrain(Window *w, int x, int y)
 	Vehicle *v;
 	mode = GetVehicleFromTrainDepotWndPt(w, x, y, &gdvp);
 	// share / copy orders
-	if (_thd.place_mode && mode <= 0) { _place_clicked_vehicle = gdvp.head; return; }
+	if (_thd.place_mode && mode <= 0) {
+		_place_clicked_vehicle = gdvp.head;
+		return;
+	}
 	v = gdvp.wagon;
 	switch (mode) {
 	case 0: { // start dragging of vehicle
 			} else {
 				ResetObjectToPlace();
 			}
 			break;
 		}
 	} break;
-	case WE_PLACE_OBJ: {
+	case WE_PLACE_OBJ:
 		ClonePlaceObj(w);
-	} break;
+		break;
-	case WE_ABORT_PLACE_OBJ: {
+	case WE_ABORT_PLACE_OBJ:
 		CLRBIT(w->click_state, 9);
 		InvalidateWidget(w, 9);
-	} break;
+		break;
 	// check if a vehicle in a depot was clicked..
 	case WE_MOUSELOOP: {
 		const Vehicle* v = _place_clicked_vehicle;
 			default:
 				if (v->num_orders == 0) {
 					str = STR_NO_ORDERS + _patches.vehicle_speed;
 					SetDParam(0, v->u.rail.last_speed);
-				} else
+				} else {
 					str = STR_EMPTY;
+				}
 				break;
 			}
 		}
 		/* draw the flag plus orders */
 				CMD_NAME_VEHICLE | CMD_MSG(STR_8866_CAN_T_NAME_TRAIN));
 		}
 		break;
 	case WE_RESIZE:
-		if (e->sizing.diff.y == 0)
+		if (e->sizing.diff.y == 0) break;
-			break;
 		w->vscroll.cap += e->sizing.diff.y / 14;
 		w->widget[4].unkA = (w->vscroll.cap << 8) + 1;
 		break;
 	}
 		SortVehicleList(vl);
 		SetVScrollCount(w, vl->list_length);
 		// disable 'Sort By' tooltip on Unsorted sorting criteria
-		if (vl->sort_type == SORT_BY_UNSORTED)
+		if (vl->sort_type == SORT_BY_UNSORTED) w->disabled_state |= (1 << 3);
-			w->disabled_state |= (1 << 3);
 		/* draw the widgets */
 		{
 			const Player *p = GetPlayer(owner);
 			if (station == INVALID_STATION) {
 			DrawTrainImage(v, x + 21, y + 6, w->hscroll.cap, 0, INVALID_VEHICLE);
 			DrawVehicleProfitButton(v, x, y + 13);
 			SetDParam(0, v->unitnumber);
-			if (IsTileDepotType(v->tile, TRANSPORT_RAIL) && (v->vehstatus & VS_HIDDEN))
+			if (IsTileDepotType(v->tile, TRANSPORT_RAIL) && (v->vehstatus & VS_HIDDEN)) {
 				str = STR_021F;
-			else
+			} else {
 				str = v->age > v->max_age - 366 ? STR_00E3 : STR_00E2;
+			}
 			DrawString(x, y + 2, str, 0);
 			SetDParam(0, v->profit_this_year);
 			SetDParam(1, v->profit_last_year);
 			DrawString(x + 21, y + 18, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, 0);
 			ShowDropDownMenu(w, _vehicle_sort_listing, vl->sort_type, 5, 0, 0);
 			return;
 		case 7: { /* Matrix to show vehicles */
 			uint32 id_v = (e->click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / PLY_WND_PRC__SIZE_OF_ROW_SMALL;
+			const Vehicle* v;
 			if (id_v >= w->vscroll.cap) return; // click out of bounds
 			id_v += w->vscroll.pos;
-			{
+			if (id_v >= vl->list_length) return; // click out of list bound
-				Vehicle *v;
+			v = GetVehicle(vl->sort_list[id_v].index);
-				if (id_v >= vl->list_length) return; // click out of list bound
+			assert(v->type == VEH_Train && IsFrontEngine(v) && v->owner == owner);
-				v = GetVehicle(vl->sort_list[id_v].index);
+			ShowTrainViewWindow(v);
-				assert(v->type == VEH_Train && IsFrontEngine(v) && v->owner == owner);
-				ShowTrainViewWindow(v);
-			}
 		} break;
 		case 9: /* Build new Vehicle */
 			if (!IsWindowOfPrototype(w, _player_trains_widgets)) break;
 			ShowBuildTrainWindow(0);
 			break;
-		case 10: {
+		case 10:
-			if (!IsWindowOfPrototype(w, _player_trains_widgets))
+			if (IsWindowOfPrototype(w, _player_trains_widgets)) break;
-				break;
 			ShowReplaceVehicleWindow(VEH_Train);
 			break;
-		}
 		}
 	}	break;
 	case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */
 			vl->flags |= VL_RESORT;
 			vl->sort_type = e->dropdown.index;
 			_sorting.train.criteria = vl->sort_type;
 			// enable 'Sort By' if a sorter criteria is chosen
-			if (vl->sort_type != SORT_BY_UNSORTED)
+			if (vl->sort_type != SORT_BY_UNSORTED) CLRBIT(w->disabled_state, 3);
-				CLRBIT(w->disabled_state, 3);
 		}
 		SetWindowDirty(w);
 		break;
 	case WE_CREATE: /* set up resort timer */
 	if (player == _local_player) {
 		w = AllocateWindowDescFront(&_player_trains_desc, (station << 16) | player);
 	} else {
 		w = AllocateWindowDescFront(&_other_player_trains_desc, (station << 16) | player);
 	}
-	if (w) {
+	if (w != NULL) {
 		w->caption_color = player;
 		w->hscroll.cap = 10 * 29;
 		w->vscroll.cap = 7; // maximum number of vehicles shown
 		w->widget[7].unkA = (w->vscroll.cap << 8) + 1;
 		w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL;

changeset 4077	d4d440dd8925
parent 4049	d65bf8f154bc
child 4088	15e5d08bf433