mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r7079) -Codechange: Move an array to the only place it is used.
This commit is contained in:
parent
8371325a10
commit
3da04ab1b5
22
engine.c
22
engine.c
|
@ -34,28 +34,6 @@ enum {
|
||||||
YEAR_ENGINE_AGING_STOPS = 2050,
|
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);
|
void ShowEnginePreviewWindow(EngineID engine);
|
||||||
|
|
||||||
|
|
2
engine.h
2
engine.h
|
@ -128,8 +128,6 @@ void AddTypeToEngines(void);
|
||||||
void StartupEngines(void);
|
void StartupEngines(void);
|
||||||
|
|
||||||
|
|
||||||
VARDEF const uint32 _default_refitmasks[NUM_VEHICLE_TYPES];
|
|
||||||
|
|
||||||
void DrawTrainEngine(int x, int y, EngineID engine, uint32 image_ormod);
|
void DrawTrainEngine(int x, int y, EngineID engine, uint32 image_ormod);
|
||||||
void DrawRoadVehEngine(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);
|
void DrawShipEngine(int x, int y, EngineID engine, uint32 image_ormod);
|
||||||
|
|
25
newgrf.c
25
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.
|
* Precalculate refit masks from cargo classes for all vehicles.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
extern int _traininfo_vehicle_pitch;
|
extern int _traininfo_vehicle_pitch;
|
||||||
extern int _traininfo_vehicle_width;
|
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 CargoID _global_cargo_id[NUM_LANDSCAPE][NUM_CARGO];
|
||||||
extern const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE];
|
extern const uint32 _landscape_global_cargo_mask[NUM_LANDSCAPE];
|
||||||
extern const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID];
|
extern const CargoID _local_cargo_id_ctype[NUM_GLOBAL_CID];
|
||||||
|
|
Loading…
Reference in New Issue