summaryrefslogtreecommitdiff
path: root/src/newgrf.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
commit24c4d5b06d231785db01500360c26815d8fe4d15 (patch)
tree757477dbdc02025cc29690a4e66e40f872cab02b /src/newgrf.h
parent36bb92ae241403d61dc7a3e5a1696b615be61395 (diff)
downloadopenttd-24c4d5b06d231785db01500360c26815d8fe4d15.tar.xz
(svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
Diffstat (limited to 'src/newgrf.h')
-rw-r--r--src/newgrf.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/newgrf.h b/src/newgrf.h
index dd388a72a..963145f65 100644
--- a/src/newgrf.h
+++ b/src/newgrf.h
@@ -8,31 +8,31 @@
#include "helpers.hpp"
#include "cargotype.h"
-typedef enum GrfLoadingStage {
+enum GrfLoadingStage {
GLS_FILESCAN,
GLS_SAFETYSCAN,
GLS_LABELSCAN,
GLS_INIT,
GLS_ACTIVATION,
GLS_END,
-} GrfLoadingStage;
+};
DECLARE_POSTFIX_INCREMENT(GrfLoadingStage);
-typedef struct GRFLabel {
+struct GRFLabel {
byte label;
uint32 nfo_line;
uint32 pos;
struct GRFLabel *next;
-} GRFLabel;
+};
-typedef struct GRFFile {
+struct GRFFile {
char *filename;
uint32 grfid;
uint16 sprite_offset;
byte grf_version;
- struct GRFFile *next;
+ GRFFile *next;
/* A sprite group contains all sprites of a given vehicle (or multiple
* vehicles) when carrying given cargo. It consists of several sprite
@@ -65,7 +65,7 @@ typedef struct GRFFile {
uint8 cargo_max;
CargoLabel *cargo_list;
uint8 cargo_map[NUM_CARGO];
-} GRFFile;
+};
extern GRFFile *_first_grffile;