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/train_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/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 1d5a88877..d2a12e2c0 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -112,7 +112,7 @@ static void TrainCargoChanged(Vehicle* v) uint32 weight = 0; for (Vehicle *u = v; u != NULL; u = u->next) { - uint32 vweight = GetCargo(u->cargo_type)->weight * u->cargo_count * FreightWagonMult(u->cargo_type) / 16; + uint32 vweight = GetCargo(u->cargo_type)->weight * u->cargo.Count() * FreightWagonMult(u->cargo_type) / 16; /* Vehicle weight is not added for articulated parts. */ if (!IsArticulatedPart(u)) { @@ -463,7 +463,7 @@ int GetTrainImage(const Vehicle* v, Direction direction) base = _engine_sprite_base[img] + ((direction + _engine_sprite_add[img]) & _engine_sprite_and[img]); - if (v->cargo_count >= v->cargo_cap / 2) base += _wagon_full_adder[img]; + if (v->cargo.Count() >= v->cargo_cap / 2) base += _wagon_full_adder[img]; return base; } @@ -1761,7 +1761,7 @@ CommandCost CmdRefitRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 num += amount; if (flags & DC_EXEC) { - v->cargo_count = (v->cargo_type == new_cid) ? min(amount, v->cargo_count) : 0; + v->cargo.Truncate((v->cargo_type == new_cid) ? amount : 0); v->cargo_type = new_cid; v->cargo_cap = amount; v->cargo_subtype = new_subtype; @@ -2681,7 +2681,7 @@ static uint CountPassengersInTrain(const Vehicle* v) { uint num = 0; BEGIN_ENUM_WAGONS(v) - if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) num += v->cargo_count; + if (IsCargoInClass(v->cargo_type, CC_PASSENGERS)) num += v->cargo.Count(); END_ENUM_WAGONS(v) return num; } @@ -3294,8 +3294,7 @@ static void TrainLocoHandler(Vehicle *v, bool mode) void Train_Tick(Vehicle *v) { - if (_age_cargo_skip_counter == 0 && v->cargo_days != 0xff) - v->cargo_days++; + if (_age_cargo_skip_counter == 0) v->cargo.AgeCargo(); v->tick_counter++; |