mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-01-24 08:01:33 +00:00
(svn r3137) -Fix: [autoreplace] fixed assert that was triggerable when a vehicle entered a depot even though the goto depot was canceled
this assert could be reached by clicking on the goto depot button to cancel goto depot from the orders and the vehicle still entered the depot. The flags in that case would not be "normal" anymore. An additional check is added to prevent this
This commit is contained in:
parent
c8ea743e47
commit
7d4d13df35
@ -527,7 +527,7 @@ Vehicle *_first_veh_in_depot_list;
|
||||
void VehicleEnteredDepotThisTick(Vehicle *v)
|
||||
{
|
||||
// we need to set v->leave_depot_instantly as we have no control of it's contents at this time
|
||||
if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {
|
||||
if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS) && v->current_order.type == OT_GOTO_DEPOT) {
|
||||
// we keep the vehicle in the depot since the user ordered it to stay
|
||||
v->leave_depot_instantly = false;
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user