diff options
| author | rubidium <rubidium@openttd.org> | 2007-06-22 11:58:59 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-06-22 11:58:59 +0000 |
| commit | e5c352818d7edfdc5219e4c82f7d5b2083b2b72d (patch) | |
| tree | fd6fbc96b8d23bef18ed7267fa8174e1689c8e78 /src/ship_cmd.cpp | |
| parent | 6159f58948763ed39a457e6ff825a735eea06b23 (diff) | |
| download | openttd-e5c352818d7edfdc5219e4c82f7d5b2083b2b72d.tar.xz | |
(svn r10266) -Codechange: keep track of the origin, time of travel and accumulated feeder share (transfers) of individual pieces of cargo. This means that cargo isn't thrown on a big pile when it's put in a station or unloaded at a station, however the GUI does not reflect these changes yet so you will not actually see it.
Diffstat (limited to 'src/ship_cmd.cpp')
| -rw-r--r-- | src/ship_cmd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp index 23ca3b337..92caf6e5b 100644 --- a/src/ship_cmd.cpp +++ b/src/ship_cmd.cpp @@ -784,7 +784,7 @@ reverse_direction: static void AgeShipCargo(Vehicle *v) { if (_age_cargo_skip_counter != 0) return; - if (v->cargo_days != 255) v->cargo_days++; + v->cargo.AgeCargo(); } void Ship_Tick(Vehicle *v) @@ -1110,7 +1110,7 @@ CommandCost CmdRefitShip(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) if (flags & DC_EXEC) { v->cargo_cap = capacity; - v->cargo_count = (v->cargo_type == new_cid) ? min(v->cargo_cap, v->cargo_count) : 0; + v->cargo.Truncate((v->cargo_type == new_cid) ? capacity : 0); v->cargo_type = new_cid; v->cargo_subtype = new_subtype; InvalidateWindow(WC_VEHICLE_DETAILS, v->index); |