Mercurial > hg > openttd

changeset 4732:e69481bcedc7 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r6644) -Fix(r6637): remove inline to allow MSVC compilation -Fix(r5124): Add aircraft.h to MSVC projects
author belugas <belugas@openttd.org>
date Thu, 05 Oct 2006 02:26:27 +0000
parents 46de108d78a4
children ed178a2794db
files aircraft.h aircraft_cmd.c openttd.vcproj openttd_vs80.vcproj
diffstat 4 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/aircraft.h
+++ b/aircraft.h
@@ -21,6 +21,6 @@
 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 */
--- a/aircraft_cmd.c
+++ b/aircraft_cmd.c
@@ -834,11 +834,9 @@
 }
 
 /** 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;
 
--- 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
--- 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>