summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelestar <celestar@openttd.org>2005-02-13 21:51:47 +0000
committercelestar <celestar@openttd.org>2005-02-13 21:51:47 +0000
commit3608788f6bcfd4ca77b8dfdca7ee7ca87bd672c2 (patch)
tree53c21845a1c30ab6a6236de0e4c3e3676b08ad08
parent4b3bac1572481a1989ca1f492f8c0e772e8c20ef (diff)
downloadopenttd-3608788f6bcfd4ca77b8dfdca7ee7ca87bd672c2.tar.xz
(svn r1872) -Fix: Fixed an inline problem which caused MSVC6 to not compile :/
-rw-r--r--station.h6
-rw-r--r--station_cmd.c5
2 files changed, 5 insertions, 6 deletions
diff --git a/station.h b/station.h
index 4a4d721b1..cb843f415 100644
--- a/station.h
+++ b/station.h
@@ -259,7 +259,11 @@ uint32 GetCustomStationRelocation(struct StationSpec *spec, struct Station *stat
int GetCustomStationsCount(enum StationClass sclass);
RoadStop * GetRoadStopByTile(TileIndex tile, RoadStopType type);
-inline int GetRoadStopType(TileIndex tile);
+static inline int GetRoadStopType(TileIndex tile)
+{
+ return (_map5[tile] < 0x47) ? RS_TRUCK : RS_BUS;
+}
+
uint GetNumRoadStops(const Station *st, RoadStopType type);
RoadStop * GetPrimaryRoadStop(const Station *st, RoadStopType type);
RoadStop * AllocateRoadStop( void );
diff --git a/station_cmd.c b/station_cmd.c
index d60f4acaf..addb90a3e 100644
--- a/station_cmd.c
+++ b/station_cmd.c
@@ -90,11 +90,6 @@ static void InitializeRoadStop(RoadStop *road_stop, RoadStop *previous, TileInde
road_stop->station = index;
}
-inline int GetRoadStopType(TileIndex tile)
-{
- return (_map5[tile] < 0x47) ? RS_TRUCK : RS_BUS;
-}
-
RoadStop * GetPrimaryRoadStop(const Station *st, RoadStopType type)
{
switch (type) {