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

Merge branch 'auto_timetables-sx' into jgrpp

Browse Source 
Fix day length scaling issue.

# Conflicts:
#	src/timetable_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2016-01-30 16:23:38 +00:00
parent 3512403610 b43c08857b
commit d9466fa424
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/timetable_cmd.cpp
View File

@@ -315,7 +315,10 @@ CommandCost CmdSetTimetableStart(TileIndex tile, DoCommandFlag flags, uint32 p1,
w->lateness_counter = 0;
ClrBit(w->vehicle_flags, VF_TIMETABLE_STARTED);
/* Do multiplication, then division to reduce rounding errors. */
w->timetable_start = start_date + idx * total_duration / num_vehs;
w->timetable_start = start_date + idx * total_duration / (num_vehs * _settings_game.economy.day_length_factor);
if (w->timetable_start < (((DateTicks)_date * DAY_TICKS) + _date_fract) && idx < 0) {
w->timetable_start += (total_duration / _settings_game.economy.day_length_factor);
}
SetWindowDirty(WC_VEHICLE_TIMETABLE, w->index);
}
@@ -697,14 +700,16 @@ void UpdateVehicleTimetable(Vehicle *v, bool travelling)
}
if (new_time < 1) new_time = 1;
if (new_time != (int32)timetabled)
if (new_time != (int32)timetabled) {
ChangeTimetable(v, v->cur_real_order_index, new_time, travelling ? MTF_TRAVEL_TIME : MTF_WAIT_TIME, true);
}
} else if (timetabled == 0 && HasBit(v->vehicle_flags, VF_AUTOMATE_TIMETABLE)) {
/* Add times for orders that are not yet timetabled, even while not autofilling */
if (travelling)
ChangeTimetable(v, v->cur_real_order_index, time_taken, travelling ? MTF_TRAVEL_TIME : MTF_WAIT_TIME, true);
else
ChangeTimetable(v, v->cur_real_order_index, time_loading, travelling ? MTF_TRAVEL_TIME : MTF_WAIT_TIME, true);
if (travelling) {
ChangeTimetable(v, v->cur_real_order_index, time_taken, MTF_TRAVEL_TIME, true);
} else {
ChangeTimetable(v, v->cur_real_order_index, time_loading, MTF_WAIT_TIME, true);
}
}
/* Vehicles will wait at stations if they arrive early even if they are not