Mercurial > hg > openttd
changeset 5547:e0691ac816a7 draft
(svn r7901) -Codechange: Remove some misplaced externs and use extern, not VARDEF, in the place they should be...
| author | peter1138 <peter1138@openttd.org> |
|---|---|
| date | Sat, 06 Jan 2007 13:26:04 +0000 |
| parents | 1fec89329303 |
| children | d9b9f7ab9959 |
| files | src/newgrf_cargo.h src/newgrf_engine.h |
| diffstat | 2 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_cargo.h +++ b/src/newgrf_cargo.h @@ -52,9 +52,9 @@ NUM_GLOBAL_CID = 32 }; -VARDEF const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO]; -VARDEF const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE]; -VARDEF const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID]; -VARDEF const uint32 cargo_classes[16]; +extern const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO]; +extern const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE]; +extern const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID]; +extern const uint32 cargo_classes[16]; #endif /* NEWGRF_CARGO_H */
--- a/src/newgrf_engine.h +++ b/src/newgrf_engine.h @@ -13,10 +13,6 @@ extern int _traininfo_vehicle_pitch; extern int _traininfo_vehicle_width; -extern const CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO]; -extern const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE]; -extern const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID]; -extern const uint32 cargo_classes[16]; void SetWagonOverrideSprites(EngineID engine, CargoID cargo, const struct SpriteGroup *group, byte *train_id, int trains); void SetCustomEngineSprites(EngineID engine, byte cargo, const struct SpriteGroup *group);