cpp/openttd-patchpack/source Changeset - r5037:f6c5a8815d61

Changeset - r5037:f6c5a8815d61

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

peter1138 - 18 years ago 2006-11-06 10:11:03
peter1138@openttd.org

(svn r7079) -Codechange: Move an array to the only place it is used.

4 files changed with 25 insertions and 25 deletions:

engine.c

engine.h

newgrf.c

newgrf_engine.h

0 comments (0 inline, 0 general)

engine.c

➞

Show inline comments

@@ @@ -25,46 +25,24 @@ AircraftVehicleInfo _aircraft_vehicle_in @@
 RoadVehicleInfo _road_vehicle_info[NUM_ROAD_ENGINES];
 enum {
 	ENGINE_AVAILABLE   = 1,
 	ENGINE_INTRODUCING = 2,
 	ENGINE_PREVIEWING  = 4,
 };
 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) */
 ,
 	/* 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
 };
 #undef MC
 void ShowEnginePreviewWindow(EngineID engine);
 void DeleteCustomEngineNames(void)
+{
 	uint i;
 	StringID old;
 	for (i = 0; i != TOTAL_NUM_ENGINES; i++) {
 		old = _engine_name_strings[i];
 		_engine_name_strings[i] = i + STR_8000_KIRBY_PAUL_TANK_STEAM;
 		DeleteName(old);

engine.h

➞

Show inline comments

@@ @@ -119,26 +119,24 @@ enum { @@
 enum {
 	NUM_VEHICLE_TYPES = 6
 };
 enum {
 	INVALID_ENGINE = 0xFFFF,
 };
 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);
 void DrawAircraftEngine(int x, int y, EngineID engine, uint32 image_ormod);
 void LoadCustomEngineNames(void);
 void DeleteCustomEngineNames(void);
 bool IsEngineBuildable(uint engine, byte type);
 enum {
 	NUM_NORMAL_RAIL_ENGINES = 54,

newgrf.c

➞

Show inline comments

@@ @@ -3296,24 +3296,49 @@ static void InitNewGRFFile(const GRFConf @@
 	newfile->param_end = config->num_params;
 	memcpy(newfile->param, config->param, 0x80 * sizeof(newfile->param[0]));
 	if (_first_grffile == NULL) {
 		_cur_grffile = newfile;
 		_first_grffile = newfile;
 	} else {
 		_cur_grffile->next = newfile;
 		_cur_grffile = newfile;
+	}
+}
 /** 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) */
 ,
 	/* 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
 };
 #undef MC
 /**
  * Precalculate refit masks from cargo classes for all vehicles.
  */
 static void CalculateRefitMasks(void)
+{
 	EngineID engine;
 	for (engine = 0; engine < TOTAL_NUM_ENGINES; engine++) {
 		uint32 mask = 0;
 		uint32 not_mask = 0;
 		uint32 xor_mask = _engine_info[engine].refit_mask;
 		byte i;

newgrf_engine.h

➞

Show inline comments

@@ @@ -4,25 +4,24 @@ @@
 #define NEWGRF_ENGINE_H
 #include "newgrf.h"
 #include "direction.h"
 #include "newgrf_cargo.h"
 /** @file newgrf_engine.h
  */
 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];
 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);
 void SetRotorOverrideSprites(EngineID engine, const struct SpriteGroup *group);
 SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle* v, Direction direction);
 SpriteID GetRotorOverrideSprite(EngineID engine, const Vehicle* v, bool info_view);
 #define GetCustomRotorSprite(v, i) GetRotorOverrideSprite(v->engine_type, v, i)
 #define GetCustomRotorIcon(et) GetRotorOverrideSprite(et, NULL, true)

0 comments (0 inline, 0 general)