From d449145799787df3ba92f731f98e28aeb9d6a156 Mon Sep 17 00:00:00 2001 From: celestar Date: Sun, 13 Feb 2005 21:51:47 +0000 Subject: [PATCH] (svn r1872) -Fix: Fixed an inline problem which caused MSVC6 to not compile :/ --- station.h | 6 +++++- station_cmd.c | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/station.h b/station.h index 4a4d721b19..cb843f415d 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 d60f4acafb..addb90a3e0 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) {