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

(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)

Browse Source
This commit is contained in:
frosch
2013-04-13 13:42:08 +00:00
parent 0d31cea85f
commit c5d7445704
20 changed files with 105 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/api/script_station.cpp
View File

@@ -41,7 +41,7 @@
if (!IsValidStation(station_id)) return -1;
if (!ScriptCargo::IsValidCargo(cargo_id)) return -1;
return ::Station::Get(station_id)->goods[cargo_id].cargo.Count();
return ::Station::Get(station_id)->goods[cargo_id].cargo.TotalCount();
}
/* static */ bool ScriptStation::HasCargoRating(StationID station_id, CargoID cargo_id)

2
src/script/api/script_vehicle.cpp
View File

@@ -399,7 +399,7 @@
uint32 amount = 0;
for (const Vehicle *v = ::Vehicle::Get(vehicle_id); v != NULL; v = v->Next()) {
if (v->cargo_type == cargo) amount += v->cargo.Count();
if (v->cargo_type == cargo) amount += v->cargo.StoredCount();
}
return amount;