diff options
author | rubidium <rubidium@openttd.org> | 2011-12-15 21:56:00 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-12-15 21:56:00 +0000 |
commit | 3d88c74389ec978bb198415816364898963bb979 (patch) | |
tree | 828173a0f2926b9082ff0ec1a08a293b213defba /src/saveload | |
parent | df0afdf0dca6b3d4f621248ada2aed73d7481c66 (diff) | |
download | openttd-3d88c74389ec978bb198415816364898963bb979.tar.xz |
(svn r23526) -Codechange: unify cargos vs cargoes
Diffstat (limited to 'src/saveload')
-rw-r--r-- | src/saveload/afterload.cpp | 2 | ||||
-rw-r--r-- | src/saveload/station_sl.cpp | 2 | ||||
-rw-r--r-- | src/saveload/town_sl.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp index 85a1ace1d..17bd0b8cb 100644 --- a/src/saveload/afterload.cpp +++ b/src/saveload/afterload.cpp @@ -2707,7 +2707,7 @@ bool AfterLoadGame() Town *town; FOR_ALL_TOWNS(town) { - UpdateTownCargos(town); + UpdateTownCargoes(town); } } diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp index 78277d4bd..c8864d6df 100644 --- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -289,7 +289,7 @@ static void Load_STNS() StationID source = (IsSavegameVersionBefore(7) && _cargo_source == 0xFF) ? INVALID_STATION : _cargo_source; /* Make sure we can allocate the CargoPacket. This is safe - * as there can only be ~64k stations and 32 cargos in these + * as there can only be ~64k stations and 32 cargoes in these * savegame versions. As the CargoPacketPool has more than * 16 million entries; it fits by an order of magnitude. */ assert(CargoPacket::CanAllocateItem()); diff --git a/src/saveload/town_sl.cpp b/src/saveload/town_sl.cpp index fbee07655..4a2920984 100644 --- a/src/saveload/town_sl.cpp +++ b/src/saveload/town_sl.cpp @@ -97,7 +97,7 @@ void UpdateHousesAndTowns() /* Update the population and num_house dependant values */ FOR_ALL_TOWNS(town) { UpdateTownRadius(town); - UpdateTownCargos(town); + UpdateTownCargoes(town); } UpdateTownCargoBitmap(); } |