diff options
| author | peter1138 <peter1138@openttd.org> | 2007-02-20 22:09:21 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2007-02-20 22:09:21 +0000 |
| commit | 3d581f4f894293f45666220de78651ba6b9a7d1c (patch) | |
| tree | 9caff20858ac3f06265e4f69d54b9cdb03a47004 /src/train_cmd.cpp | |
| parent | f91ed92648c6577f7605e1eba63c82532735bbad (diff) | |
| download | openttd-3d581f4f894293f45666220de78651ba6b9a7d1c.tar.xz | |
(svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels.
Diffstat (limited to 'src/train_cmd.cpp')
| -rw-r--r-- | src/train_cmd.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 98bdb7be6..7dd31711e 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -33,6 +33,7 @@ #include "direction.h" #include "yapf/yapf.h" #include "date.h" +#include "cargotype.h" static bool TrainCheckIfLineEnds(Vehicle *v); static void TrainController(Vehicle *v, bool update_image); @@ -106,7 +107,7 @@ static void TrainCargoChanged(Vehicle* v) for (u = v; u != NULL; u = u->next) { const RailVehicleInfo *rvi = RailVehInfo(u->engine_type); - uint32 vweight = (_cargoc.weights[u->cargo_type] * 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)) { |