summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-05-17 21:26:12 +0000
committerpeter1138 <peter1138@openttd.org>2006-05-17 21:26:12 +0000
commit282b76a0b3683fda13eb8c413720aff957c74f8b (patch)
treee6f9f48703c42cc20eef57f8a0476871b5828a4e
parent450c13c1da3d636d7426de62369a0314702e9449 (diff)
downloadopenttd-282b76a0b3683fda13eb8c413720aff957c74f8b.tar.xz
(svn r4901) - Codechange: change 'SpriteGroup *' to 'struct SpriteGroup *' within StationSpec and GRFFile struct declarations. Now only code which actually references those pointers needs to know about the SpriteGroup struct. Remove some unnecessary lingering header dependencies.
-rw-r--r--engine.c2
-rw-r--r--engine.h1
-rw-r--r--newgrf.h3
-rw-r--r--newgrf_station.h4
-rw-r--r--sprite.h4
5 files changed, 3 insertions, 11 deletions
diff --git a/engine.c b/engine.c
index 34cb60f50..0e6b1912b 100644
--- a/engine.c
+++ b/engine.c
@@ -13,10 +13,8 @@
#include "vehicle.h"
#include "news.h"
#include "saveload.h"
-#include "sprite.h"
#include "variables.h"
#include "train.h"
-#include "newgrf_engine.h"
EngineInfo _engine_info[TOTAL_NUM_ENGINES];
RailVehicleInfo _rail_vehicle_info[NUM_TRAIN_ENGINES];
diff --git a/engine.h b/engine.h
index 64ce15934..197220695 100644
--- a/engine.h
+++ b/engine.h
@@ -6,7 +6,6 @@
/** @file engine.h
*/
-#include "sprite.h"
#include "pool.h"
typedef struct RailVehicleInfo {
diff --git a/newgrf.h b/newgrf.h
index bc1b7ca4d..5618fbdae 100644
--- a/newgrf.h
+++ b/newgrf.h
@@ -3,7 +3,6 @@
#ifndef NEWGRF_H
#define NEWGRF_H
-#include "sprite.h"
#include "station.h"
typedef struct GRFLabel {
@@ -38,7 +37,7 @@ typedef struct GRFFile {
int spriteset_feature;
int spritegroups_count;
- SpriteGroup **spritegroups;
+ struct SpriteGroup **spritegroups;
StationSpec **stations;
diff --git a/newgrf_station.h b/newgrf_station.h
index 33f3d732a..284b80121 100644
--- a/newgrf_station.h
+++ b/newgrf_station.h
@@ -72,8 +72,8 @@ typedef struct StationSpec {
* Used for obtaining the sprite offset of custom sprites, and for
* evaluating callbacks.
*/
- SpriteGroup *spritegroup[NUM_GLOBAL_CID];
- SpriteGroup *groundgroup;
+ struct SpriteGroup *spritegroup[NUM_GLOBAL_CID];
+ struct SpriteGroup *groundgroup;
} StationSpec;
/**
diff --git a/sprite.h b/sprite.h
index f8a2e6174..21a9f32cf 100644
--- a/sprite.h
+++ b/sprite.h
@@ -41,8 +41,4 @@ typedef struct DrawBuildingsTileStruct {
#define foreach_draw_tile_seq(idx, list) for (idx = list; ((byte) idx->delta_x) != 0x80; idx++)
-// XXX Temporary include while juggling about
-#include "newgrf_spritegroup.h"
-
-
#endif /* SPRITE_H */