Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r12467) -Codechange: move DepotID to a more logical location.

Browse Source
This commit is contained in:
rubidium 2008-03-28 16:32:27 +00:00
parent 450d234745
commit 7f139373aa
7 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
projects/openttd_vs80.vcproj
View File

@ -891,6 +891,10 @@
RelativePath=".\..\src\depot.h" RelativePath=".\..\src\depot.h"
> >
</File> </File>
<File
RelativePath=".\..\src\depot_type.h"
>
</File>
<File <File
RelativePath=".\..\src\direction_func.h" RelativePath=".\..\src\direction_func.h"
> >

4
projects/openttd_vs90.vcproj
View File

@ -888,6 +888,10 @@
RelativePath=".\..\src\depot.h" RelativePath=".\..\src\depot.h"
> >
</File> </File>
<File
RelativePath=".\..\src\depot_type.h"
>
</File>
<File <File
RelativePath=".\..\src\direction_func.h" RelativePath=".\..\src\direction_func.h"
> >

1
source.list
View File

@ -131,6 +131,7 @@ debug.h
video/dedicated_v.h video/dedicated_v.h
ai/default/default.h ai/default/default.h
depot.h depot.h
depot_type.h
direction_func.h direction_func.h
direction_type.h direction_type.h
music/dmusic.h music/dmusic.h

2
src/depot.h
View File

@ -6,13 +6,13 @@
#define DEPOT_H #define DEPOT_H
#include "direction_type.h" #include "direction_type.h"
#include "depot_type.h"
#include "oldpool.h" #include "oldpool.h"
#include "road_map.h" #include "road_map.h"
#include "rail_map.h" #include "rail_map.h"
#include "water_map.h" #include "water_map.h"
#include "station_map.h" #include "station_map.h"
struct Depot;
DECLARE_OLD_POOL(Depot, Depot, 3, 8000) DECLARE_OLD_POOL(Depot, Depot, 3, 8000)
struct Depot : PoolItem<Depot, DepotID, &_Depot_pool> { struct Depot : PoolItem<Depot, DepotID, &_Depot_pool> {

11
src/depot_type.h Normal file
View File

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

2
src/openttd.h
View File

@ -9,7 +9,6 @@
#endif #endif
// Forward declarations of structs. // Forward declarations of structs.
struct Depot;
struct Waypoint; struct Waypoint;
struct Station; struct Station;
struct ViewPort; struct ViewPort;
@ -26,7 +25,6 @@ typedef EngineID *EngineList; ///< engine list type placeholder acceptable for C
typedef uint16 StationID; typedef uint16 StationID;
static const StationID INVALID_STATION = 0xFFFF; static const StationID INVALID_STATION = 0xFFFF;
typedef uint16 RoadStopID; typedef uint16 RoadStopID;
typedef uint16 DepotID;
typedef uint16 WaypointID; typedef uint16 WaypointID;
typedef uint16 OrderID; typedef uint16 OrderID;
typedef uint16 SignID; typedef uint16 SignID;

1
src/yapf/yapf.h
View File

@ -6,6 +6,7 @@
#define YAPF_H #define YAPF_H
#include "../debug.h" #include "../debug.h"
#include "../depot_type.h"
/** Finds the best path for given ship. /** Finds the best path for given ship.
* @param v the ship that needs to find a path * @param v the ship that needs to find a path