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

Avoid unnecessary GoodsEntryData creation

Browse Source
This commit is contained in:
Jonathan G Rennison
2024-06-30 13:12:53 +01:00
parent f1504dcc34
commit f8b008cd28
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cargopacket.cpp
View File

@@ -636,7 +636,7 @@ bool VehicleCargoList::Stage(bool accepted, StationID current_station, StationID
CargoPacketList transfer_deliver; CargoPacketList transfer_deliver;
std::vector<CargoPacket *> keep; std::vector<CargoPacket *> keep;
const FlowStatMap &flows = ge->CreateData().flows; const FlowStatMap &flows = ge->ConstFlows();
bool force_keep = (order_flags & OUFB_NO_UNLOAD) != 0; bool force_keep = (order_flags & OUFB_NO_UNLOAD) != 0;
bool force_unload = (order_flags & OUFB_UNLOAD) != 0; bool force_unload = (order_flags & OUFB_UNLOAD) != 0;

1
src/linkgraph/linkgraphjob.cpp
View File

@@ -182,6 +182,7 @@ void LinkGraphJob::FinaliseJob()
geflows.insert(std::move(*it)); geflows.insert(std::move(*it));
} }
geflows.SortStorage(); geflows.SortStorage();
ge.RemoveDataIfUnused();
InvalidateWindowData(WC_STATION_VIEW, st->index, this->Cargo()); InvalidateWindowData(WC_STATION_VIEW, st->index, this->Cargo());
} }
} }

5
src/station_base.h
View File

@@ -715,6 +715,11 @@ struct GoodsEntry {
{ {
return this->data != nullptr ? this->data->flows : _empty_flows; return this->data != nullptr ? this->data->flows : _empty_flows;
} }
void RemoveDataIfUnused()
{
if (this->data != nullptr && this->data->MayBeRemoved()) this->data.reset();
}
}; };
/** All airport-related information. Only valid if tile != INVALID_TILE. */ /** All airport-related information. Only valid if tile != INVALID_TILE. */