diff options
| author | belugas <belugas@openttd.org> | 2006-10-05 02:26:27 +0000 |
|---|---|---|
| committer | belugas <belugas@openttd.org> | 2006-10-05 02:26:27 +0000 |
| commit | 66206867fe22233e91754f54c88e83fc9f4eca79 (patch) | |
| tree | c957f8107c3cbccddcd57b715e61cab0fa360991 | |
| parent | 0257cc1496578020d7942059b3518acc6b0a63df (diff) | |
| download | openttd-66206867fe22233e91754f54c88e83fc9f4eca79.tar.xz | |
(svn r6644) -Fix(r6637): remove inline to allow MSVC compilation
-Fix(r5124): Add aircraft.h to MSVC projects
| -rw-r--r-- | aircraft.h | 2 | ||||
| -rw-r--r-- | aircraft_cmd.c | 4 | ||||
| -rw-r--r-- | openttd.vcproj | 3 | ||||
| -rw-r--r-- | openttd_vs80.vcproj | 4 |
4 files changed, 9 insertions, 4 deletions
diff --git a/aircraft.h b/aircraft.h index b7c93ee28..15d2bbe27 100644 --- a/aircraft.h +++ b/aircraft.h @@ -21,6 +21,6 @@ static inline bool IsAircraftInHangarStopped(const Vehicle* v) uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type); void CcCloneAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2); -inline void HandleAircraftEnterHangar(Vehicle *v); +void HandleAircraftEnterHangar(Vehicle *v); #endif /* AIRCRAFT_H */ diff --git a/aircraft_cmd.c b/aircraft_cmd.c index a64227a97..70336c0da 100644 --- a/aircraft_cmd.c +++ b/aircraft_cmd.c @@ -834,11 +834,9 @@ static void SetAircraftPosition(Vehicle *v, int x, int y, int z) } /** Handle Aircraft specific tasks when a an Aircraft enters a hangar - * Made inline because it's only called from one location (VehicleEnterDepot) - * Can't be moved to vehicle.c because it calls static Aircraft specific functions * @param *v Vehicle that enters the hangar */ -inline void HandleAircraftEnterHangar(Vehicle *v) +void HandleAircraftEnterHangar(Vehicle *v) { Vehicle *u; diff --git a/openttd.vcproj b/openttd.vcproj index d7ad6bf84..f32b35c03 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -428,6 +428,9 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl"> <File + RelativePath=".\aircraft.h"> + </File> + <File RelativePath=".\airport.h"> </File> <File diff --git a/openttd_vs80.vcproj b/openttd_vs80.vcproj index fabeba140..832878cfa 100644 --- a/openttd_vs80.vcproj +++ b/openttd_vs80.vcproj @@ -856,6 +856,10 @@ Filter="h;hpp;hxx;hm;inl"
>
<File
+ RelativePath=".\aircraft.h"
+ >
+ </File>
+ <File
RelativePath=".\airport.h"
>
</File>
|