diff options
| author | tron <tron@openttd.org> | 2007-01-21 16:08:18 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2007-01-21 16:08:18 +0000 |
| commit | bc523186e0f67d15d3ddaa509c3dc93682d32565 (patch) | |
| tree | 62b971a1827e32a4c7c4c5d5c4b6ffac8ec5e910 /src/newgrf.cpp | |
| parent | 9e9d5905f3a6bd41cca2529a2f46e12610f07847 (diff) | |
| download | openttd-bc523186e0f67d15d3ddaa509c3dc93682d32565.tar.xz | |
(svn r8314) -Fix
-Codechange: Move the railtype from EngineInfo to RailVehicleInfo, because having a railtype for non-rail vehicles isn't that useful
Diffstat (limited to 'src/newgrf.cpp')
| -rw-r--r-- | src/newgrf.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 0861970f3..cc1a2a05d 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -236,9 +236,9 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf uint8 tracktype = grf_load_byte(&buf); switch (tracktype) { - case 0: ei[i].railtype = rvi[i].engclass == 2 ? RAILTYPE_ELECTRIC : RAILTYPE_RAIL; break; - case 1: ei[i].railtype = RAILTYPE_MONO; break; - case 2: ei[i].railtype = RAILTYPE_MAGLEV; break; + case 0: rvi[i].railtype = rvi[i].engclass == 2 ? RAILTYPE_ELECTRIC : RAILTYPE_RAIL; break; + case 1: rvi[i].railtype = RAILTYPE_MONO; break; + case 2: rvi[i].railtype = RAILTYPE_MAGLEV; break; default: grfmsg(1, "RailVehicleChangeInfo: Invalid track type %d specified, ignoring", tracktype); break; @@ -383,8 +383,8 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf } else { break; } - if (ei[i].railtype == RAILTYPE_RAIL && engclass == 2) ei[i].railtype = RAILTYPE_ELECTRIC; - if (ei[i].railtype == RAILTYPE_ELECTRIC && engclass != 2) ei[i].railtype = RAILTYPE_RAIL; + if (rvi[i].railtype == RAILTYPE_RAIL && engclass == 2) rvi[i].railtype = RAILTYPE_ELECTRIC; + if (rvi[i].railtype == RAILTYPE_ELECTRIC && engclass != 2) rvi[i].railtype = RAILTYPE_RAIL; rvi[i].engclass = engclass; } |