diff options
| author | rubidium <rubidium@openttd.org> | 2007-12-21 22:50:51 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-12-21 22:50:51 +0000 |
| commit | 3074bca136dc9a7848d4897d7236baed51406bd3 (patch) | |
| tree | 92a4b604ccb6ae352038348f78b52b1f91cfd691 /src/station_cmd.cpp | |
| parent | 4fc66235cb17456f8b7f09f8ba50bff6017c25d5 (diff) | |
| download | openttd-3074bca136dc9a7848d4897d7236baed51406bd3.tar.xz | |
(svn r11680) -Codechange: refactor more out of openttd.h and functions.h.
Diffstat (limited to 'src/station_cmd.cpp')
| -rw-r--r-- | src/station_cmd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index e876f4c10..ba31f9243 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -9,7 +9,7 @@ #include "bridge_map.h" #include "cmd_helper.h" #include "debug.h" -#include "functions.h" +#include "tile_cmd.h" #include "landscape.h" #include "station_map.h" #include "table/sprites.h" @@ -2345,7 +2345,7 @@ static const byte _enter_station_speedtable[12] = { 215, 195, 175, 155, 135, 115, 95, 75, 55, 35, 15, 0 }; -static uint32 VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y) +static VehicleEnterTileStatus VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y) { if (v->type == VEH_TRAIN) { if (IsRailwayStation(tile) && IsFrontEngine(v) && @@ -2365,7 +2365,7 @@ static uint32 VehicleEnter_Station(Vehicle *v, TileIndex tile, int x, int y) if (DiagDirToAxis(dir) != AXIS_X) Swap(x, y); if (y == TILE_SIZE / 2) { if (dir != DIAGDIR_SE && dir != DIAGDIR_SW) x = TILE_SIZE - 1 - x; - if (x == 12) return VETSB_ENTERED_STATION | (station_id << VETS_STATION_ID_OFFSET); /* enter station */ + if (x == 12) return VETSB_ENTERED_STATION | (VehicleEnterTileStatus)(station_id << VETS_STATION_ID_OFFSET); /* enter station */ if (x < 12) { uint16 spd; |