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/newgrf_engine.cpp | |
| parent | df0afdf0dca6b3d4f621248ada2aed73d7481c66 (diff) | |
| download | openttd-3d88c74389ec978bb198415816364898963bb979.tar.xz | |
(svn r23526) -Codechange: unify cargos vs cargoes
Diffstat (limited to 'src/newgrf_engine.cpp')
| -rw-r--r-- | src/newgrf_engine.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp index 5e5ba91a9..4ed4cdfe3 100644 --- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -37,7 +37,7 @@ void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const SpriteGroup * Engine *e = Engine::Get(engine); WagonOverride *wo; - assert(cargo < NUM_CARGO + 2); // Include CT_DEFAULT and CT_PURCHASE pseudo cargos. + assert(cargo < NUM_CARGO + 2); // Include CT_DEFAULT and CT_PURCHASE pseudo cargoes. e->overrides_count++; e->overrides = ReallocT(e->overrides, e->overrides_count); @@ -485,14 +485,14 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte if (!HasBit(v->grf_cache.cache_valid, NCVV_CONSIST_CARGO_INFORMATION)) { const Vehicle *u; byte cargo_classes = 0; - uint8 common_cargos[NUM_CARGO]; + uint8 common_cargoes[NUM_CARGO]; uint8 common_subtypes[256]; byte user_def_data = 0; CargoID common_cargo_type = CT_INVALID; uint8 common_subtype = 0xFF; // Return 0xFF if nothing is carried /* Reset our arrays */ - memset(common_cargos, 0, sizeof(common_cargos)); + memset(common_cargoes, 0, sizeof(common_cargoes)); memset(common_subtypes, 0, sizeof(common_subtypes)); for (u = v; u != NULL; u = u->Next()) { @@ -502,14 +502,14 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte if (u->cargo_cap == 0) continue; cargo_classes |= CargoSpec::Get(u->cargo_type)->classes; - common_cargos[u->cargo_type]++; + common_cargoes[u->cargo_type]++; } /* Pick the most common cargo type */ uint common_cargo_best_amount = 0; for (CargoID cargo = 0; cargo < NUM_CARGO; cargo++) { - if (common_cargos[cargo] > common_cargo_best_amount) { - common_cargo_best_amount = common_cargos[cargo]; + if (common_cargoes[cargo] > common_cargo_best_amount) { + common_cargo_best_amount = common_cargoes[cargo]; common_cargo_type = cargo; } } |