Mercurial > hg > openttd
changeset 8768:27a5e249703b draft
(svn r12467) -Codechange: move DepotID to a more logical location.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Fri, 28 Mar 2008 16:32:27 +0000 |
parents | c0458cd19987 |
children | a6d0d3e06eff |
files | projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list src/depot.h src/depot_type.h src/openttd.h src/yapf/yapf.h |
diffstat | 7 files changed, 22 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -892,6 +892,10 @@ > </File> <File + RelativePath=".\..\src\depot_type.h" + > + </File> + <File RelativePath=".\..\src\direction_func.h" > </File>
--- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -889,6 +889,10 @@ > </File> <File + RelativePath=".\..\src\depot_type.h" + > + </File> + <File RelativePath=".\..\src\direction_func.h" > </File>
--- a/source.list +++ b/source.list @@ -131,6 +131,7 @@ video/dedicated_v.h ai/default/default.h depot.h +depot_type.h direction_func.h direction_type.h music/dmusic.h
--- a/src/depot.h +++ b/src/depot.h @@ -6,13 +6,13 @@ #define DEPOT_H #include "direction_type.h" +#include "depot_type.h" #include "oldpool.h" #include "road_map.h" #include "rail_map.h" #include "water_map.h" #include "station_map.h" -struct Depot; DECLARE_OLD_POOL(Depot, Depot, 3, 8000) struct Depot : PoolItem<Depot, DepotID, &_Depot_pool> {
new file mode 100644 --- /dev/null +++ b/src/depot_type.h @@ -0,0 +1,11 @@ +/* $Id$ */ + +/** @file depot_type.h Header files for depots (not hangars) */ + +#ifndef DEPOT_TYPE_H +#define DEPOT_TYPE_H + +typedef uint16 DepotID; +struct Depot; + +#endif /* DEPOT_TYPE_H */
--- a/src/openttd.h +++ b/src/openttd.h @@ -9,7 +9,6 @@ #endif // Forward declarations of structs. -struct Depot; struct Waypoint; struct Station; struct ViewPort; @@ -26,7 +25,6 @@ typedef uint16 StationID; static const StationID INVALID_STATION = 0xFFFF; typedef uint16 RoadStopID; -typedef uint16 DepotID; typedef uint16 WaypointID; typedef uint16 OrderID; typedef uint16 SignID;