openttd-ottdgrfs: comparison order

equal deleted inserted replaced

-:e5a166837162
+:e4555522d257
 Order UnpackOldOrder(uint16 packed)
 {
 	Order order;
 	order.type    = GB(packed, 0, 4);
 	order.flags   = GB(packed, 4, 4);
-	order.station = GB(packed, 8, 8);
+	order.dest.station = GB(packed, 8, 8);
 	order.next    = NULL;
 	// Sanity check
 	// TTD stores invalid orders as OT_NOTHING with non-zero flags/station
-	if (order.type == OT_NOTHING && (order.flags != 0 || order.station != 0)) {
+	if (order.type == OT_NOTHING && (order.flags != 0 || order.dest.station != 0)) {
 		order.type = OT_DUMMY;
 		order.flags = 0;
 	}
 	return order;
 static Order UnpackVersion4Order(uint16 packed)
 {
 	Order order;
 	order.type    = GB(packed, 0, 4);
 	order.flags   = GB(packed, 4, 4);
-	order.station = GB(packed, 8, 8);
+	order.dest.station = GB(packed, 8, 8);
 	order.next    = NULL;
 	order.index   = 0; // avoid compiler warning
 	return order;
 }
 */
 void AssignOrder(Order *order, Order data)
 {
 	order->type    = data.type;
 	order->flags   = data.flags;
-	order->station = data.station;
+	order->dest.station = data.dest.station;
 }
 /**
 * Delete all news items regarding defective orders about a vehicle
 	 * and has the correct flags if any */
 	switch (new_order.type) {
 		case OT_GOTO_STATION: {
 			const Station *st;
-			if (!IsValidStationID(new_order.station)) return CMD_ERROR;
+			if (!IsValidStationID(new_order.dest.station)) return CMD_ERROR;
-			st = GetStation(new_order.station);
+			st = GetStation(new_order.dest.station);
 			if (st->airport_type != AT_OILRIG && !IsBuoy(st) && !CheckOwnership(st->owner)) {
 				return CMD_ERROR;
 			}
 		case OT_GOTO_DEPOT: {
 			if (v->type == VEH_Aircraft) {
 				const Station* st;
-				if (!IsValidStationID(new_order.station)) return CMD_ERROR;
+				if (!IsValidStationID(new_order.dest.station)) return CMD_ERROR;
-				st = GetStation(new_order.station);
+				st = GetStation(new_order.dest.station);
 				if ((st->airport_type != AT_OILRIG && !CheckOwnership(st->owner)) ||
 						!(st->facilities & FACIL_AIRPORT) ||
 						GetAirport(st->airport_type)->nof_depots == 0) {
 					return CMD_ERROR;
 				}
 			} else {
 				const Depot* dp;
-				if (!IsValidDepotID(new_order.station)) return CMD_ERROR;
+				if (!IsValidDepotID(new_order.dest.depot)) return CMD_ERROR;
-				dp = GetDepot(new_order.station);
+				dp = GetDepot(new_order.dest.depot);
 				if (!CheckOwnership(GetTileOwner(dp->xy))) return CMD_ERROR;
 				switch (v->type) {
 					case VEH_Train:
 		case OT_GOTO_WAYPOINT: {
 			const Waypoint* wp;
 			if (v->type != VEH_Train) return CMD_ERROR;
-			if (!IsValidWaypointID(new_order.station)) return CMD_ERROR;
+			if (!IsValidWaypointID(new_order.dest.waypoint)) return CMD_ERROR;
-			wp = GetWaypoint(new_order.station);
+			wp = GetWaypoint(new_order.dest.waypoint);
 			if (!CheckOwnership(GetTileOwner(wp->xy))) return CMD_ERROR;
 			/* Order flags can be any of the following for waypoints:
 			 * [non-stop]
 	if (v->type == VEH_Ship && IS_HUMAN_PLAYER(v->owner) &&
 		sel_ord != 0 && GetVehicleOrder(v, sel_ord - 1)->type == OT_GOTO_STATION
 		&& !_patches.new_pathfinding_all) {
 		int dist = DistanceManhattan(
-			GetStation(GetVehicleOrder(v, sel_ord - 1)->station)->xy,
+			GetStation(GetVehicleOrder(v, sel_ord - 1)->dest.station)->xy,
-			GetStation(new_order.station)->xy // XXX type != OT_GOTO_STATION?
+			GetStation(new_order.dest.station)->xy // XXX type != OT_GOTO_STATION?
 		);
 		if (dist >= 130)
 			return_cmd_error(STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO);
 	}
 				const Order *order;
 				TileIndex required_dst = INVALID_TILE;
 				FOR_VEHICLE_ORDERS(src, order) {
 					if (order->type == OT_GOTO_STATION) {
-						const Station *st = GetStation(order->station);
+						const Station *st = GetStation(order->dest.station);
 						if (dst->cargo_type == CT_PASSENGERS) {
 							if (st->bus_stops != NULL) required_dst = st->bus_stops->xy;
 						} else {
 							if (st->truck_stops != NULL) required_dst = st->truck_stops->xy;
 						}
 				problem_type = 1;
 				break;
 			}
 			/* Does station have a load-bay for this vehicle? */
 			if (order->type == OT_GOTO_STATION) {
-				const Station* st = GetStation(order->station);
+				const Station* st = GetStation(order->dest.station);
 				TileIndex required_tile = GetStationTileForVehicle(v, st);
 				n_st++;
 				if (required_tile == 0) problem_type = 3;
 			}
 		if (v->num_orders > 1) {
 			const Order* last = GetLastVehicleOrder(v);
 			if (v->orders->type    == last->type &&
 					v->orders->flags   == last->flags &&
-					v->orders->station == last->station) {
+					v->orders->dest.station == last->dest.station) {
 				problem_type = 2;
 			}
 		}
 		/* Do we only have 1 station in our order list? */
 /**
 * Removes an order from all vehicles. Triggers when, say, a station is removed.
 * @param type The type of the order (OT_GOTO_[STATION|DEPOT|WAYPOINT]).
 * @param destination The destination. Can be a StationID, DepotID or WaypointID.
 */
-void RemoveOrderFromAllVehicles(OrderType type, StationID destination)
+void RemoveOrderFromAllVehicles(OrderType type, DestinationID destination)
 {
 	Vehicle *v;
 	Order *order;
 	bool need_invalidate;
 	/* Go through all vehicles */
 	FOR_ALL_VEHICLES(v) {
 		if (v->orders == NULL) continue;
 		/* Forget about this station if this station is removed */
-		if (v->last_station_visited == destination && type == OT_GOTO_STATION)
+		if (v->last_station_visited == destination.station && type == OT_GOTO_STATION)
 			v->last_station_visited = INVALID_STATION;
 		/* Check the current order */
-		if (v->current_order.type == type && v->current_order.station == destination) {
+		if (v->current_order.type == type && v->current_order.dest.station == destination.station) {
 			/* Mark the order as DUMMY */
 			v->current_order.type = OT_DUMMY;
 			v->current_order.flags = 0;
 			InvalidateWindow(WC_VEHICLE_VIEW, v->index);
 		}
 		/* Clear the order from the order-list */
 		need_invalidate = false;
 		FOR_VEHICLE_ORDERS(v, order) {
-			if (order->type == type && order->station == destination) {
+			if (order->type == type && order->dest.station == destination.station) {
 				/* Mark the order as DUMMY */
 				order->type = OT_DUMMY;
 				order->flags = 0;
 				need_invalidate = true;
 }
 static const SaveLoad _order_desc[] = {
 	SLE_VAR(Order, type,    SLE_UINT8),
 	SLE_VAR(Order, flags,   SLE_UINT8),
-	SLE_VAR(Order, station, SLE_UINT16),
+	SLE_VAR(Order, dest.station, SLE_UINT16), // Saving one of the union is enough, they all share the same memory
 	SLE_REF(Order, next,    REF_ORDER),
 	// reserve extra space in savegame here. (currently 10 bytes)
 	SLE_CONDNULL(10, 5, SL_MAX_VERSION),
 	SLE_END()

changeset 4389	e4555522d257
parent 4384	293c0d26294c
child 4391	7bfd170bfdf5