Merge branch 'tracerestrict-sx' into jgrpp

# Conflicts:
#	src/train_cmd.cpp
This commit is contained in:
Jonathan G Rennison
2018-08-16 05:45:30 +01:00
7 changed files with 24 additions and 5 deletions

View File

@@ -1992,6 +1992,7 @@ void VehicleEnterDepot(Vehicle *v)
case VEH_TRAIN: {
Train *t = Train::From(v);
SetWindowClassesDirty(WC_TRAINS_LIST);
SetWindowClassesDirty(WC_TRACE_RESTRICT_SLOTS);
/* Clear path reservation */
SetDepotReservation(t->tile, false);
if (_settings_client.gui.show_track_reservation) MarkTileDirtyByTile(t->tile, ZOOM_LVL_DRAW_MAP);
@@ -3658,6 +3659,7 @@ void VehiclesYearlyLoop()
}
GroupStatistics::UpdateProfits();
SetWindowClassesDirty(WC_TRAINS_LIST);
SetWindowClassesDirty(WC_TRACE_RESTRICT_SLOTS);
SetWindowClassesDirty(WC_SHIPS_LIST);
SetWindowClassesDirty(WC_ROADVEH_LIST);
SetWindowClassesDirty(WC_AIRCRAFT_LIST);