diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-22 18:17:20 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-22 18:17:20 +0000 |
| commit | 441011b782294e93b47876f24de96a63da7dd678 (patch) | |
| tree | 7592579bbde1a91f353a6d685a8a64128f6a6955 /src/tunnelbridge_cmd.cpp | |
| parent | cf0cfb908f02ca54efd5956f11909514de062015 (diff) | |
| download | openttd-441011b782294e93b47876f24de96a63da7dd678.tar.xz | |
(svn r16382) -Codechange: make GetVehicleTrackdir a member function of Vehicle.
Diffstat (limited to 'src/tunnelbridge_cmd.cpp')
| -rw-r--r-- | src/tunnelbridge_cmd.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index 489e5a8ed..26f5b6635 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -15,6 +15,7 @@ #include "town.h" #include "variables.h" #include "train.h" +#include "ship.h" #include "water_map.h" #include "yapf/yapf.h" #include "newgrf_sound.h" @@ -1470,7 +1471,7 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti break; case VEH_SHIP: - v->u.ship.state = TRACK_BIT_WORMHOLE; + static_cast<Ship*>(v)->state = TRACK_BIT_WORMHOLE; break; default: NOT_REACHED(); @@ -1495,8 +1496,8 @@ static VehicleEnterTileStatus VehicleEnter_TunnelBridge(Vehicle *v, TileIndex ti break; case VEH_SHIP: - if (v->u.ship.state == TRACK_BIT_WORMHOLE) { - v->u.ship.state = (DiagDirToAxis(dir) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y); + if (static_cast<Ship*>(v)->state == TRACK_BIT_WORMHOLE) { + static_cast<Ship*>(v)->state = (DiagDirToAxis(dir) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y); return VETSB_ENTERED_WORMHOLE; } break; |