diff options
| author | frosch <frosch@openttd.org> | 2012-11-12 21:59:02 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2012-11-12 21:59:02 +0000 |
| commit | 883f9bec9b762f3615524726cd8e17c2df19dbe1 (patch) | |
| tree | fc7994745489e7d7148bb0151963faa12e29a745 /src/newgrf_station.cpp | |
| parent | ce87b8fc63c424fcb403130b2a5cf0dcf7c2980d (diff) | |
| download | openttd-883f9bec9b762f3615524726cd8e17c2df19dbe1.tar.xz | |
(svn r24718) -Codechange: Rename GoodsEntry::days_since_pickup to GoodsEntry::time_since_pickup.
Diffstat (limited to 'src/newgrf_station.cpp')
| -rw-r--r-- | src/newgrf_station.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index 52631ad87..8092a953f 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -422,7 +422,7 @@ uint32 Station::GetNewGRFVariable(const ResolverObject *object, byte variable, b switch (variable) { case 0x60: return min(ge->cargo.Count(), 4095); - case 0x61: return ge->HasVehicleEverTriedLoading() ? ge->days_since_pickup : 0; + case 0x61: return ge->HasVehicleEverTriedLoading() ? ge->time_since_pickup : 0; case 0x62: return HasBit(ge->acceptance_pickup, GoodsEntry::GES_PICKUP) ? ge->rating : 0xFFFFFFFF; case 0x63: return ge->cargo.DaysInTransit(); case 0x64: return ge->HasVehicleEverTriedLoading() ? ge->last_speed | (ge->last_age << 8) : 0xFF00; @@ -442,7 +442,7 @@ uint32 Station::GetNewGRFVariable(const ResolverObject *object, byte variable, b 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::GES_ACCEPTANCE, 1) << 7); - case 2: return g->days_since_pickup; + case 2: return g->time_since_pickup; case 3: return g->rating; case 4: return g->cargo.Source(); case 5: return g->cargo.DaysInTransit(); |