summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-11-06 10:11:03 +0000
committerpeter1138 <peter1138@openttd.org>2006-11-06 10:11:03 +0000
commit3da04ab1b5db262df37156b5da5de8a2cf072a87 (patch)
tree91e133d6156081ec32bb3fce17029a81cc44b0fb
parent8371325a100178e6134b5bf6e23fae7aed178bb5 (diff)
downloadopenttd-3da04ab1b5db262df37156b5da5de8a2cf072a87.tar.xz
(svn r7079) -Codechange: Move an array to the only place it is used.
-rw-r--r--engine.c22
-rw-r--r--engine.h2
-rw-r--r--newgrf.c25
-rw-r--r--newgrf_engine.h1
4 files changed, 25 insertions, 25 deletions
diff --git a/engine.c b/engine.c
index 9ca53aa05..f2f903af3 100644
--- a/engine.c
+++ b/engine.c
@@ -34,28 +34,6 @@ enum {
YEAR_ENGINE_AGING_STOPS = 2050,
};
-/** Bitmasked values of what type of cargo is refittable for the given vehicle-type.
- * This coupled with the landscape information (_landscape_global_cargo_mask) gives
- * us exactly what is refittable and what is not */
-#define MC(cargo) (1 << cargo)
-const uint32 _default_refitmasks[NUM_VEHICLE_TYPES] = {
- /* Trains */
- MC(GC_PASSENGERS) | MC(GC_COAL) | MC(GC_MAIL) | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_IRON_ORE) |
- MC(GC_STEEL) | MC(GC_VALUABLES) | MC(GC_PAPER) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_COPPER_ORE) | MC(GC_WATER) | MC(GC_SUGAR) |
- MC(GC_TOYS) | MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
- /* Road vehicles (not refittable by default) */
- 0,
- /* Ships */
- MC(GC_COAL) | MC(GC_MAIL) | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_IRON_ORE) | MC(GC_STEEL) | MC(GC_VALUABLES) |
- MC(GC_PAPER) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_COPPER_ORE) | MC(GC_WATER) | MC(GC_RUBBER) | MC(GC_SUGAR) | MC(GC_TOYS) | MC(GC_BATTERIES) |
- MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
- /* Aircraft */
- MC(GC_PASSENGERS) | MC(GC_MAIL) | MC(GC_GOODS) | MC(GC_VALUABLES) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_SUGAR) | MC(GC_TOYS) |
- MC(GC_BATTERIES) | MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
- /* Special/Disaster */
- 0,0
-};
-#undef MC
void ShowEnginePreviewWindow(EngineID engine);
diff --git a/engine.h b/engine.h
index 0440dcc4f..6fff71368 100644
--- a/engine.h
+++ b/engine.h
@@ -128,8 +128,6 @@ void AddTypeToEngines(void);
void StartupEngines(void);
-VARDEF const uint32 _default_refitmasks[NUM_VEHICLE_TYPES];
-
void DrawTrainEngine(int x, int y, EngineID engine, uint32 image_ormod);
void DrawRoadVehEngine(int x, int y, EngineID engine, uint32 image_ormod);
void DrawShipEngine(int x, int y, EngineID engine, uint32 image_ormod);
diff --git a/newgrf.c b/newgrf.c
index dfd05c9c5..59965bb6a 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -3305,6 +3305,31 @@ static void InitNewGRFFile(const GRFConfig *config, int sprite_offset)
}
}
+
+/** Bitmasked values of what type of cargo is refittable for the given vehicle-type.
+ * This coupled with the landscape information (_landscape_global_cargo_mask) gives
+ * us exactly what is refittable and what is not */
+#define MC(cargo) (1 << cargo)
+static const uint32 _default_refitmasks[NUM_VEHICLE_TYPES] = {
+ /* Trains */
+ MC(GC_PASSENGERS) | MC(GC_COAL) | MC(GC_MAIL) | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_IRON_ORE) |
+ MC(GC_STEEL) | MC(GC_VALUABLES) | MC(GC_PAPER) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_COPPER_ORE) | MC(GC_WATER) | MC(GC_SUGAR) |
+ MC(GC_TOYS) | MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
+ /* Road vehicles (not refittable by default) */
+ 0,
+ /* Ships */
+ MC(GC_COAL) | MC(GC_MAIL) | MC(GC_LIVESTOCK) | MC(GC_GOODS) | MC(GC_GRAIN) | MC(GC_WOOD) | MC(GC_IRON_ORE) | MC(GC_STEEL) | MC(GC_VALUABLES) |
+ MC(GC_PAPER) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_COPPER_ORE) | MC(GC_WATER) | MC(GC_RUBBER) | MC(GC_SUGAR) | MC(GC_TOYS) | MC(GC_BATTERIES) |
+ MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
+ /* Aircraft */
+ MC(GC_PASSENGERS) | MC(GC_MAIL) | MC(GC_GOODS) | MC(GC_VALUABLES) | MC(GC_FOOD) | MC(GC_FRUIT) | MC(GC_SUGAR) | MC(GC_TOYS) |
+ MC(GC_BATTERIES) | MC(GC_CANDY) | MC(GC_TOFFEE) | MC(GC_COLA) | MC(GC_COTTON_CANDY) | MC(GC_BUBBLES) | MC(GC_PLASTIC) | MC(GC_FIZZY_DRINKS),
+ /* Special/Disaster */
+ 0,0
+};
+#undef MC
+
+
/**
* Precalculate refit masks from cargo classes for all vehicles.
*/
diff --git a/newgrf_engine.h b/newgrf_engine.h
index 252a1ad1c..bd9ddb230 100644
--- a/newgrf_engine.h
+++ b/newgrf_engine.h
@@ -13,7 +13,6 @@
extern int _traininfo_vehicle_pitch;
extern int _traininfo_vehicle_width;
-VARDEF const uint32 _default_refitmasks[NUM_VEHICLE_TYPES];
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];