dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update departure board to handle changed minutes.

Browse Source 
Use scaled date ticks internally.
This commit is contained in:
Jonathan G Rennison
2015-08-30 19:40:58 +01:00
parent 0b22a8e5c6
commit 60ba68cc69
3 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/departures.cpp
View File

@@ -94,7 +94,10 @@ DepartureList* MakeDepartureList(StationID station, bool show_vehicle_types[5],
SmallVector<OrderDate*, 32> next_orders;
/* The maximum possible date for departures to be scheduled to occur. */
DateTicks max_date = _settings_client.gui.max_departure_time * DAY_TICKS;
DateTicksScaled max_date = _settings_client.gui.max_departure_time * DAY_TICKS * _settings_game.economy.day_length_factor;
DateTicksScaled date_only_scaled = ((DateTicksScaled)_date * DAY_TICKS * _settings_game.economy.day_length_factor);
DateTicksScaled date_fract_scaled = ((DateTicksScaled)_date_fract * _settings_game.economy.day_length_factor) + _tick_skip_counter;
/* The scheduled order in next_orders with the earliest expected_date field. */
OrderDate *least_order = NULL;
@@ -138,7 +141,7 @@ DepartureList* MakeDepartureList(StationID station, bool show_vehicle_types[5],
}
const Order *order = (*v)->GetOrder((*v)->cur_implicit_order_index % (*v)->GetNumOrders());
DateTicks start_date = (DateTicks)_date_fract - ((*v)->current_order_time / _settings_game.economy.day_length_factor);
DateTicksScaled start_date = date_fract_scaled - (*v)->current_order_time;
DepartureStatus status = D_TRAVELLING;
/* If the vehicle is stopped in a depot, ignore it. */
@@ -280,7 +283,7 @@ DepartureList* MakeDepartureList(StationID station, bool show_vehicle_types[5],
/* We already know the least order and that it's a suitable departure, so make it into a departure. */
Departure *d = new Departure();
d->scheduled_date = (DateTicks)_date * DAY_TICKS + least_order->expected_date - least_order->lateness;
d->scheduled_date = date_only_scaled + least_order->expected_date - least_order->lateness;
d->lateness = least_order->lateness;
d->status = least_order->status;
d->vehicle = least_order->v;
@@ -645,16 +648,6 @@ DepartureList* MakeDepartureList(StationID station, bool show_vehicle_types[5],
delete od;
}
uint8 day_len = _settings_game.economy.day_length_factor;
if (day_len > 1) {
DateTicks now = ((DateTicks)_date * DAY_TICKS) + _date_fract;
for (size_t i = 0; i < result->Length(); i++) {
Departure *dep = (*result)[i];
dep->scheduled_date = now + (dep->scheduled_date - now) / day_len;
dep->lateness /= day_len;
}
}
/* Done. Phew! */
return result;
}