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

Add ctrl-click scroll to for non-destination orders

Browse Source 
Conditional orders on station cargo and show as via orders
This commit is contained in:
Jonathan G Rennison
2024-03-16 17:32:45 +00:00
parent 3284bd68e3
commit 1532c96ca7
3 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/order_cmd.cpp
View File

@@ -956,6 +956,30 @@ TileIndex Order::GetLocation(const Vehicle *v, bool airport) const
}
}
/**
* Returns a tile somewhat representing the order's auxiliary location (not related to vehicle movement).
* @param secondary Whether to return a second auxiliary location, if available.
* @return auxiliary location of order, or INVALID_TILE if none.
*/
TileIndex Order::GetAuxiliaryLocation(bool secondary) const
{
if (this->IsType(OT_CONDITIONAL)) {
if (secondary && this->GetConditionVariable() == OCV_CARGO_WAITING_AMOUNT && GB(this->GetXData(), 16, 16) != 0) {
const Station *st = Station::GetIfValid(GB(this->GetXData(), 16, 16) - 2);
if (st != nullptr) return st->xy;
}
if (ConditionVariableHasStationID(this->GetConditionVariable())) {
const Station *st = Station::GetIfValid(GB(this->GetXData2(), 0, 16) - 1);
if (st != nullptr) return st->xy;
}
}
if (this->IsType(OT_LABEL) && IsDestinationOrderLabelSubType(this->GetLabelSubType())) {
const BaseStation *st = BaseStation::GetIfValid(this->GetDestination());
if (st != nullptr) return st->xy;
}
return INVALID_TILE;
}
/**
* Get the distance between two orders of a vehicle. Conditional orders are resolved
* and the bigger distance of the two order branches is returned.