mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r12474) -Codechange: split type related stuff from waypoints from waypoint.h (and openttd.h) to waypoint_type.h.

release/0.7
rubidium 2008-03-28 16:41:12 +00:00
parent cdd5f90e64
commit f4d48f0e5b
7 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
projects/openttd_vs80.vcproj
View File

@ -1347,6 +1347,10 @@
RelativePath=".\..\src\station_gui.h" RelativePath=".\..\src\station_gui.h"
> >
</File> </File>
<File
RelativePath=".\..\src\station_type.h"
>
</File>
<File <File
RelativePath=".\..\src\stdafx.h" RelativePath=".\..\src\stdafx.h"
> >
@ -1475,6 +1479,10 @@
RelativePath=".\..\src\waypoint.h" RelativePath=".\..\src\waypoint.h"
> >
</File> </File>
<File
RelativePath=".\..\src\waypoint_type.h"
>
</File>
<File <File
RelativePath=".\..\src\music\win32_m.h" RelativePath=".\..\src\music\win32_m.h"
> >

8
projects/openttd_vs90.vcproj
View File

@ -1344,6 +1344,10 @@
RelativePath=".\..\src\station_gui.h" RelativePath=".\..\src\station_gui.h"
> >
</File> </File>
<File
RelativePath=".\..\src\station_type.h"
>
</File>
<File <File
RelativePath=".\..\src\stdafx.h" RelativePath=".\..\src\stdafx.h"
> >
@ -1472,6 +1476,10 @@
RelativePath=".\..\src\waypoint.h" RelativePath=".\..\src\waypoint.h"
> >
</File> </File>
<File
RelativePath=".\..\src\waypoint_type.h"
>
</File>
<File <File
RelativePath=".\..\src\music\win32_m.h" RelativePath=".\..\src\music\win32_m.h"
> >

1
source.list
View File

@ -278,6 +278,7 @@ vehicle_type.h
viewport_func.h viewport_func.h
viewport_type.h viewport_type.h
waypoint.h waypoint.h
waypoint_type.h
music/win32_m.h music/win32_m.h
sound/win32_s.h sound/win32_s.h
video/win32_v.h video/win32_v.h

2
src/openttd.h
View File

@ -9,13 +9,11 @@
#endif #endif
// Forward declarations of structs. // Forward declarations of structs.
struct Waypoint;
typedef byte LandscapeID; typedef byte LandscapeID;
typedef uint16 EngineID; typedef uint16 EngineID;
typedef uint16 UnitID; typedef uint16 UnitID;
/* IDs used in Pools */ /* IDs used in Pools */
typedef uint16 WaypointID;
typedef uint16 EngineRenewID; typedef uint16 EngineRenewID;
enum GameModes { enum GameModes {

1
src/rail_map.h
View File

@ -11,6 +11,7 @@
#include "track_func.h" #include "track_func.h"
#include "tile_map.h" #include "tile_map.h"
#include "signal_type.h" #include "signal_type.h"
#include "waypoint_type.h"
/** Different types of Rail-related tiles */ /** Different types of Rail-related tiles */

2
src/waypoint.h
View File

@ -5,12 +5,12 @@
#ifndef WAYPOINT_H #ifndef WAYPOINT_H
#define WAYPOINT_H #define WAYPOINT_H
#include "waypoint_type.h"
#include "oldpool.h" #include "oldpool.h"
#include "rail_map.h" #include "rail_map.h"
#include "command_type.h" #include "command_type.h"
#include "station_type.h" #include "station_type.h"
struct Waypoint;
DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000) DECLARE_OLD_POOL(Waypoint, Waypoint, 3, 8000)
struct Waypoint : PoolItem<Waypoint, WaypointID, &_Waypoint_pool> { struct Waypoint : PoolItem<Waypoint, WaypointID, &_Waypoint_pool> {

11
src/waypoint_type.h 100644
View File

@ -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 */