Mercurial > hg > openttd
changeset 8775:8207d9e330cc draft
(svn r12474) -Codechange: split type related stuff from waypoints from waypoint.h (and openttd.h) to waypoint_type.h.
author | rubidium <rubidium@openttd.org> |
---|---|
date | Fri, 28 Mar 2008 16:41:12 +0000 |
parents | 85f0d7e75eb7 |
children | 617b8caa7d7c |
files | projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list src/openttd.h src/rail_map.h src/waypoint.h src/waypoint_type.h |
diffstat | 7 files changed, 30 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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>
--- 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>
--- a/source.list +++ b/source.list @@ -278,6 +278,7 @@ viewport_func.h viewport_type.h waypoint.h +waypoint_type.h music/win32_m.h sound/win32_s.h video/win32_v.h
--- 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 {
--- 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 */
--- 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> {