(svn r6644) -Fix(r6637): remove inline to allow MSVC compilation
-Fix(r5124): Add aircraft.h to MSVC projects
This commit is contained in:
@@ -21,6 +21,6 @@ static inline bool IsAircraftInHangarStopped(const Vehicle* v)
|
|||||||
uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type);
|
uint16 AircraftDefaultCargoCapacity(CargoID cid, EngineID engine_type);
|
||||||
|
|
||||||
void CcCloneAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2);
|
void CcCloneAircraft(bool success, TileIndex tile, uint32 p1, uint32 p2);
|
||||||
inline void HandleAircraftEnterHangar(Vehicle *v);
|
void HandleAircraftEnterHangar(Vehicle *v);
|
||||||
|
|
||||||
#endif /* AIRCRAFT_H */
|
#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
|
/** 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
|
* @param *v Vehicle that enters the hangar
|
||||||
*/
|
*/
|
||||||
inline void HandleAircraftEnterHangar(Vehicle *v)
|
void HandleAircraftEnterHangar(Vehicle *v)
|
||||||
{
|
{
|
||||||
Vehicle *u;
|
Vehicle *u;
|
||||||
|
|
||||||
|
|||||||
@@ -427,6 +427,9 @@
|
|||||||
<Filter
|
<Filter
|
||||||
Name="Header Files"
|
Name="Header Files"
|
||||||
Filter="h;hpp;hxx;hm;inl">
|
Filter="h;hpp;hxx;hm;inl">
|
||||||
|
<File
|
||||||
|
RelativePath=".\aircraft.h">
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\airport.h">
|
RelativePath=".\airport.h">
|
||||||
</File>
|
</File>
|
||||||
|
|||||||
@@ -855,6 +855,10 @@
|
|||||||
Name="Header Files"
|
Name="Header Files"
|
||||||
Filter="h;hpp;hxx;hm;inl"
|
Filter="h;hpp;hxx;hm;inl"
|
||||||
>
|
>
|
||||||
|
<File
|
||||||
|
RelativePath=".\aircraft.h"
|
||||||
|
>
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\airport.h"
|
RelativePath=".\airport.h"
|
||||||
>
|
>
|
||||||
|
|||||||
Reference in New Issue
Block a user