summaryrefslogtreecommitdiff
path: root/src/script/api
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2013-04-13 13:42:08 +0000
committerfrosch <frosch@openttd.org>2013-04-13 13:42:08 +0000
commit5eddbb338b7838c01087921c77c0738fc12cbfb2 (patch)
treee1d1b917bc00b6e7e43aad49188c98b635887b12 /src/script/api
parent8d1d521456c57b69243853b369ecc60de0421e33 (diff)
downloadopenttd-5eddbb338b7838c01087921c77c0738fc12cbfb2.tar.xz
(svn r25185) -Fix [FS#5508]: Remove ambivalent functions CargoList::Empty() and Count(), and replace them with VehicleCargoList::StoredCount(), TotalCount(), StationCargoList::AvailableCount() and TotalCount(). (fonsinchen)
Diffstat (limited to 'src/script/api')
-rw-r--r--src/script/api/script_station.cpp2
-rw-r--r--src/script/api/script_vehicle.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/script/api/script_station.cpp b/src/script/api/script_station.cpp
index a7b8459fc..bcf5e08ce 100644
--- a/src/script/api/script_station.cpp
+++ b/src/script/api/script_station.cpp
@@ -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)
diff --git a/src/script/api/script_vehicle.cpp b/src/script/api/script_vehicle.cpp
index 5bbcd543a..84cfc99fc 100644
--- a/src/script/api/script_vehicle.cpp
+++ b/src/script/api/script_vehicle.cpp
@@ -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;