diff options
| -rw-r--r-- | projects/openttd_vs80.vcproj | 8 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 8 | ||||
| -rw-r--r-- | source.list | 1 | ||||
| -rw-r--r-- | src/openttd.h | 2 | ||||
| -rw-r--r-- | src/rail_map.h | 1 | ||||
| -rw-r--r-- | src/waypoint.h | 2 | ||||
| -rw-r--r-- | src/waypoint_type.h | 11 |
7 files changed, 30 insertions, 3 deletions
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 03f7ee3d7..b80b046af 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -1348,6 +1348,10 @@ > </File> <File + RelativePath=".\..\src\station_type.h" + > + </File> + <File RelativePath=".\..\src\stdafx.h" > </File> @@ -1476,6 +1480,10 @@ > </File> <File + RelativePath=".\..\src\waypoint_type.h" + > + </File> + <File RelativePath=".\..\src\music\win32_m.h" > </File> diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 0413859e5..b639ab3c2 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1345,6 +1345,10 @@ > </File> <File + RelativePath=".\..\src\station_type.h" + > + </File> + <File RelativePath=".\..\src\stdafx.h" > </File> @@ -1473,6 +1477,10 @@ > </File> <File + RelativePath=".\..\src\waypoint_type.h" + > + </File> + <File RelativePath=".\..\src\music\win32_m.h" > </File> diff --git a/source.list b/source.list index 554aec12f..987ce13c2 100644 --- a/source.list +++ b/source.list @@ -278,6 +278,7 @@ vehicle_type.h viewport_func.h viewport_type.h waypoint.h +waypoint_type.h music/win32_m.h sound/win32_s.h video/win32_v.h diff --git a/src/openttd.h b/src/openttd.h index 8466bc958..633f10939 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -9,13 +9,11 @@ #endif // Forward declarations of structs. -struct Waypoint; typedef byte LandscapeID; typedef uint16 EngineID; typedef uint16 UnitID; /* IDs used in Pools */ -typedef uint16 WaypointID; typedef uint16 EngineRenewID; enum GameModes { diff --git a/src/rail_map.h b/src/rail_map.h index a87c400f4..008fb39ef 100644 --- a/src/rail_map.h +++ b/src/rail_map.h @@ -11,6 +11,7 @@ #include "track_func.h" #include "tile_map.h" #include "signal_type.h" +#include "waypoint_type.h" /** Different types of Rail-related tiles */ diff --git a/src/waypoint.h b/src/waypoint.h index 97e1c1ff7..3c4400d42 100644 --- a/src/waypoint.h +++ b/src/waypoint.h @@ -5,12 +5,12 @@ #ifndef WAYPOINT_H #define WAYPOINT_H +#include "waypoint_type.h" #include "oldpool.h" #include "rail_map.h" #include "command_type.h" #include "station_type.h" -struct Waypoint; DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000) struct Waypoint : PoolItem<Waypoint, WaypointID, &_Waypoint_pool> { diff --git a/src/waypoint_type.h b/src/waypoint_type.h new file mode 100644 index 000000000..c74e8cf92 --- /dev/null +++ b/src/waypoint_type.h @@ -0,0 +1,11 @@ +/* $Id$ */ + +/** @file waypoint_type.h Types related to waypoints. */ + +#ifndef WAYPOINT_TYPE_H +#define WAYPOINT_TYPE_H + +typedef uint16 WaypointID; +struct Waypoint; + +#endif /* WAYPOINT_TYPE_H */ |