diff options
| author | terkhen <terkhen@openttd.org> | 2011-06-04 21:17:07 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2011-06-04 21:17:07 +0000 |
| commit | 5bb79b1f46f2428f6416ad6d85b0e903ca9629b4 (patch) | |
| tree | 2a816344a24a473c987d081d10d2a303be08e6cf /src/newgrf_station.cpp | |
| parent | 05b125c42c0cb5e9241d96ea9d25d866094311bb (diff) | |
| download | openttd-5bb79b1f46f2428f6416ad6d85b0e903ca9629b4.tar.xz | |
(svn r22540) -Codechange: Rename AcceptancePickup to GoodsEntryStatus.
Diffstat (limited to 'src/newgrf_station.cpp')
| -rw-r--r-- | src/newgrf_station.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index af0945c05..4c02a892d 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -381,7 +381,7 @@ uint32 Station::GetNewGRFVariable(const ResolverObject *object, byte variable, b uint32 value = 0; for (cargo_type = 0; cargo_type < NUM_CARGO; cargo_type++) { - if (HasBit(this->goods[cargo_type].acceptance_pickup, GoodsEntry::PICKUP)) SetBit(value, cargo_type); + if (HasBit(this->goods[cargo_type].acceptance_pickup, GoodsEntry::GES_PICKUP)) SetBit(value, cargo_type); } return value; } @@ -407,7 +407,7 @@ uint32 Station::GetNewGRFVariable(const ResolverObject *object, byte variable, b case 0x62: return ge->rating; case 0x63: return ge->cargo.DaysInTransit(); case 0x64: return ge->last_speed | (ge->last_age << 8); - case 0x65: return GB(ge->acceptance_pickup, GoodsEntry::ACCEPTANCE, 1) << 3; + case 0x65: return GB(ge->acceptance_pickup, GoodsEntry::GES_ACCEPTANCE, 1) << 3; } } @@ -416,7 +416,7 @@ uint32 Station::GetNewGRFVariable(const ResolverObject *object, byte variable, b const GoodsEntry *g = &this->goods[GB(variable - 0x8C, 3, 4)]; switch (GB(variable - 0x8C, 0, 3)) { case 0: return g->cargo.Count(); - case 1: return GB(min(g->cargo.Count(), 4095), 0, 4) | (GB(g->acceptance_pickup, GoodsEntry::ACCEPTANCE, 1) << 7); + case 1: return GB(min(g->cargo.Count(), 4095), 0, 4) | (GB(g->acceptance_pickup, GoodsEntry::GES_ACCEPTANCE, 1) << 7); case 2: return g->days_since_pickup; case 3: return g->rating; case 4: return g->cargo.Source(); |