summaryrefslogtreecommitdiff
path: root/src/newgrf_station.h
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-03-07 12:11:48 +0000
committerrubidium <rubidium@openttd.org>2007-03-07 12:11:48 +0000
commit979ccd45baa9a38169661ba379a341cae8619c3b (patch)
tree757477dbdc02025cc29690a4e66e40f872cab02b /src/newgrf_station.h
parent4169bfba0604b33bad92389bd3eb6f9acde89f49 (diff)
downloadopenttd-979ccd45baa9a38169661ba379a341cae8619c3b.tar.xz
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
Diffstat (limited to 'src/newgrf_station.h')
-rw-r--r--src/newgrf_station.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/newgrf_station.h b/src/newgrf_station.h
index 40cdc33fb..640620fe7 100644
--- a/src/newgrf_station.h
+++ b/src/newgrf_station.h
@@ -9,12 +9,12 @@
#include "newgrf_cargo.h"
#include "helpers.hpp"
-typedef enum {
+enum StationClassID {
STAT_CLASS_BEGIN = 0, ///< the lowest valid value
STAT_CLASS_DFLT = 0, ///< Default station class.
STAT_CLASS_WAYP, ///< Waypoint class.
STAT_CLASS_MAX = 32, ///< Maximum number of classes.
-} StationClassID;
+};
/** Define basic enum properties */
template <> struct EnumPropsT<StationClassID> : MakeEnumPropsT<StationClassID, byte, STAT_CLASS_BEGIN, STAT_CLASS_MAX, STAT_CLASS_MAX> {};
@@ -27,7 +27,7 @@ DECLARE_POSTFIX_INCREMENT(StationClassID);
* where index is computed as (x * platforms) + platform. */
typedef byte *StationLayout;
-typedef struct StationSpec {
+struct StationSpec {
uint32 grfid; ///< ID of GRF file station belongs to.
int localidx; ///< Index within GRF file of station.
@@ -84,17 +84,17 @@ typedef struct StationSpec {
* evaluating callbacks.
*/
const struct SpriteGroup *spritegroup[NUM_CARGO + 3];
-} StationSpec;
+};
/**
* Struct containing information relating to station classes.
*/
-typedef struct StationClass {
+struct StationClass {
uint32 id; ///< ID of this class, e.g. 'DFLT', 'WAYP', etc.
StringID name; ///< Name of this class.
uint stations; ///< Number of stations in this class.
StationSpec **spec; ///< Array of station specifications.
-} StationClass;
+};
void ResetStationClasses();
StationClassID AllocateStationClass(uint32 cls);