Update to 12.0

This commit is contained in:
dP
2021-10-17 13:01:41 +03:00
parent 4eb8b29dbf
commit ccd5309c09
65 changed files with 2048 additions and 537 deletions

View File

@@ -609,6 +609,7 @@ bool OrderList::IsCompleteTimetable() const
return true;
}
#ifdef WITH_ASSERT
/**
* Checks for internal consistency of order list. Triggers assertion if something is wrong.
*/
@@ -642,6 +643,7 @@ void OrderList::DebugCheckSanity() const
(uint)this->num_orders, (uint)this->num_manual_orders,
this->num_vehicles, this->timetable_duration, this->total_duration);
}
#endif
/**
* Checks whether the order goes to a station or not, i.e. whether the
@@ -1782,7 +1784,7 @@ void CheckOrders(const Vehicle *v)
/* Do we only have 1 station in our order list? */
if (n_st < 2 && message == INVALID_STRING_ID) message = STR_NEWS_VEHICLE_HAS_TOO_FEW_ORDERS;
#ifndef NDEBUG
#ifdef WITH_ASSERT
if (v->orders.list != nullptr) v->orders.list->DebugCheckSanity();
#endif