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/station_cmd.cpp | |
| parent | 05b125c42c0cb5e9241d96ea9d25d866094311bb (diff) | |
| download | openttd-5bb79b1f46f2428f6416ad6d85b0e903ca9629b4.tar.xz | |
(svn r22540) -Codechange: Rename AcceptancePickup to GoodsEntryStatus.
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 73be9d1d2..9e7d1e001 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -446,7 +446,7 @@ static uint GetAcceptanceMask(const Station *st) uint mask = 0; for (CargoID i = 0; i < NUM_CARGO; i++) { - if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::ACCEPTANCE)) mask |= 1 << i; + if (HasBit(st->goods[i].acceptance_pickup, GoodsEntry::GES_ACCEPTANCE)) mask |= 1 << i; } return mask; } @@ -588,7 +588,7 @@ void UpdateStationAcceptance(Station *st, bool show_msg) amt = 0; } - SB(st->goods[i].acceptance_pickup, GoodsEntry::ACCEPTANCE, 1, amt >= 8); + SB(st->goods[i].acceptance_pickup, GoodsEntry::GES_ACCEPTANCE, 1, amt >= 8); } /* Only show a message in case the acceptance was actually changed. */ @@ -3025,12 +3025,12 @@ static void UpdateStationRating(Station *st) /* Slowly increase the rating back to his original level in the case we * didn't deliver cargo yet to this station. This happens when a bribe * failed while you didn't moved that cargo yet to a station. */ - if (!HasBit(ge->acceptance_pickup, GoodsEntry::PICKUP) && ge->rating < INITIAL_STATION_RATING) { + if (!HasBit(ge->acceptance_pickup, GoodsEntry::GES_PICKUP) && ge->rating < INITIAL_STATION_RATING) { ge->rating++; } /* Only change the rating if we are moving this cargo */ - if (HasBit(ge->acceptance_pickup, GoodsEntry::PICKUP)) { + if (HasBit(ge->acceptance_pickup, GoodsEntry::GES_PICKUP)) { byte_inc_sat(&ge->days_since_pickup); bool skip = false; @@ -3211,9 +3211,9 @@ static uint UpdateStationWaiting(Station *st, CargoID type, uint amount, SourceT ge.cargo.Append(new CargoPacket(st->index, st->xy, amount, source_type, source_id)); - if (!HasBit(ge.acceptance_pickup, GoodsEntry::PICKUP)) { + if (!HasBit(ge.acceptance_pickup, GoodsEntry::GES_PICKUP)) { InvalidateWindowData(WC_STATION_LIST, st->index); - SetBit(ge.acceptance_pickup, GoodsEntry::PICKUP); + SetBit(ge.acceptance_pickup, GoodsEntry::GES_PICKUP); } TriggerStationAnimation(st, st->xy, SAT_NEW_CARGO, type); |