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

Remove unnecessary recursion in GetNextRealStation

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-01-19 00:20:03 +00:00
parent beb6d01fe8
commit e7abf9efb1
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/order_cmd.cpp
View File

@@ -2773,14 +2773,15 @@ static uint16 GetFreeStationPlatforms(StationID st_id)
* @param order the current (conditional) order * @param order the current (conditional) order
* @return the StationID of the next valid station in the order list, or INVALID_STATION if there is none. * @return the StationID of the next valid station in the order list, or INVALID_STATION if there is none.
*/ */
static StationID GetNextRealStation(const Vehicle *v, const Order *order, int conditional_depth = 0) static StationID GetNextRealStation(const Vehicle *v, const Order *order)
{ {
if (order->IsType(OT_GOTO_STATION)) { const uint max = std::min<uint>(64, v->GetNumOrders());
if (Station::IsValidID(order->GetDestination())) return order->GetDestination(); for (uint i = 0; i < max; i++) {
if (order->IsType(OT_GOTO_STATION) && Station::IsValidID(order->GetDestination())) return order->GetDestination();
order = (order->next != nullptr) ? order->next : v->GetFirstOrder();
} }
//nothing conditional about this return INVALID_STATION;
if (conditional_depth > std::min<int>(64, v->GetNumOrders())) return INVALID_STATION;
return GetNextRealStation(v, (order->next != nullptr) ? order->next : v->GetFirstOrder(), ++conditional_depth);
} }
static std::vector<TraceRestrictSlotID> _pco_deferred_slot_acquires; static std::vector<TraceRestrictSlotID> _pco_deferred_slot_acquires;