summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2007-01-06 13:26:04 +0000
committerpeter1138 <peter1138@openttd.org>2007-01-06 13:26:04 +0000
commit86bad22c892223120257186324b476b962e01f36 (patch)
tree39b1d6c3f31fe6290b921c40156dbaaf37d37228
parentf8642fd784e9481c5118eb459094550bab7d97c1 (diff)
downloadopenttd-86bad22c892223120257186324b476b962e01f36.tar.xz
(svn r7901) -Codechange: Remove some misplaced externs and use extern, not VARDEF, in the place they should be...
-rw-r--r--src/newgrf_cargo.h8
-rw-r--r--src/newgrf_engine.h4
2 files changed, 4 insertions, 8 deletions
diff --git a/src/newgrf_cargo.h b/src/newgrf_cargo.h
index d3b352e48..fb1fc13dd 100644
--- a/src/newgrf_cargo.h
+++ b/src/newgrf_cargo.h
@@ -52,9 +52,9 @@ enum GlobalCargo {
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 */
diff --git a/src/newgrf_engine.h b/src/newgrf_engine.h
index bd9ddb230..80f2256e3 100644
--- 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);