(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.
--- a/engine.c Wed May 17 16:53:56 2006 +0000
+++ b/engine.c Wed May 17 21:26:12 2006 +0000
@@ -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];
--- a/engine.h Wed May 17 16:53:56 2006 +0000
+++ b/engine.h Wed May 17 21:26:12 2006 +0000
@@ -6,7 +6,6 @@
/** @file engine.h
*/
-#include "sprite.h"
#include "pool.h"
typedef struct RailVehicleInfo {
--- a/newgrf.h Wed May 17 16:53:56 2006 +0000
+++ b/newgrf.h Wed May 17 21:26:12 2006 +0000
@@ -3,7 +3,6 @@
#ifndef NEWGRF_H
#define NEWGRF_H
-#include "sprite.h"
#include "station.h"
typedef struct GRFLabel {
@@ -38,7 +37,7 @@
int spriteset_feature;
int spritegroups_count;
- SpriteGroup **spritegroups;
+ struct SpriteGroup **spritegroups;
StationSpec **stations;
--- a/newgrf_station.h Wed May 17 16:53:56 2006 +0000
+++ b/newgrf_station.h Wed May 17 21:26:12 2006 +0000
@@ -72,8 +72,8 @@
* 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;
/**
--- a/sprite.h Wed May 17 16:53:56 2006 +0000
+++ b/sprite.h Wed May 17 21:26:12 2006 +0000
@@ -41,8 +41,4 @@
#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 */