(svn r6644) -Fix(r6637): remove inline to allow MSVC compilation

-Fix(r5124): Add aircraft.h to MSVC projects
pull/155/head
belugas 18 years ago
parent ad4ed70cf3
commit b0444e6a50

@ -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 */

@ -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;

@ -427,6 +427,9 @@
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl">
<File
RelativePath=".\aircraft.h">
</File>
<File
RelativePath=".\airport.h">
</File>

@ -855,6 +855,10 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath=".\aircraft.h"
>
</File>
<File
RelativePath=".\airport.h"
>

Loading…
Cancel
Save