diff options
| author | rubidium <rubidium@openttd.org> | 2008-03-28 16:41:12 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-03-28 16:41:12 +0000 |
| commit | f4d48f0e5b5cf43dd0524a707ee01658c8e65793 (patch) | |
| tree | 445a46403ffa63ae3869992e725b970274c888bf /src | |
| parent | cdd5f90e647f7544a5f7a617b2c49b32ec3b2328 (diff) | |
| download | openttd-f4d48f0e5b5cf43dd0524a707ee01658c8e65793.tar.xz | |
(svn r12474) -Codechange: split type related stuff from waypoints from waypoint.h (and openttd.h) to waypoint_type.h.
Diffstat (limited to 'src')
| -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 |
4 files changed, 13 insertions, 3 deletions
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 */ |