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 
Conflicts:
	src/vehicle.cpp
This commit is contained in:
Jonathan G Rennison
2015-11-30 22:32:29 +00:00
parent 58b6bf16c3 9eb07b4a77
commit cd23d17745
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vehicle.cpp
View File

@@ -265,8 +265,8 @@ uint Vehicle::Crash(bool flooded)
v->MarkAllViewportsDirty();
}
this->ClearSeparation();
if (_settings_game.order.timetable_separation) {
this->ClearSeparation();
ClrBit(this->vehicle_flags, VF_TIMETABLE_STARTED);
}
@@ -2618,8 +2618,8 @@ CommandCost Vehicle::SendToDepot(DoCommandFlag flags, DepotCommand command)
if (flags & DC_EXEC) {
if (!(this->current_order.GetDepotOrderType() & ODTFB_BREAKDOWN)) this->current_order.SetDepotOrderType(ODTF_MANUAL);
this->current_order.SetDepotActionType(halt_in_depot ? ODATF_SERVICE_ONLY : ODATFB_HALT);
this->ClearSeparation();
if (_settings_game.order.timetable_separation) {
this->ClearSeparation();
ClrBit(this->vehicle_flags, VF_TIMETABLE_STARTED);
}
SetWindowWidgetDirty(WC_VEHICLE_VIEW, this->index, WID_VV_START_STOP);
@@ -2642,8 +2642,8 @@ CommandCost Vehicle::SendToDepot(DoCommandFlag flags, DepotCommand command)
if (this->current_order.GetDepotOrderType() & ODTFB_BREAKDOWN) {
this->current_order.SetDepotActionType(this->current_order.GetDepotActionType() == ODATFB_HALT ? ODATF_SERVICE_ONLY : ODATFB_HALT);
} else {
this->ClearSeparation();
if (_settings_game.order.timetable_separation) {
this->ClearSeparation();
ClrBit(this->vehicle_flags, VF_TIMETABLE_STARTED);
}
@@ -3102,7 +3102,7 @@ void Vehicle::RemoveFromShared()
this->next_shared = NULL;
this->previous_shared = NULL;
if (_settings_game.order.timetable_separation) this->ClearSeparation();
this->ClearSeparation();
if (_settings_game.order.timetable_separation) ClrBit(this->vehicle_flags, VF_TIMETABLE_STARTED);
}