openttd-ottdgrfs: comparison src/newgrf

equal deleted inserted replaced

-:7c8ec33959b1
+:4b5241e5dd10
 #include "newgrf_station.h"
 #include "newgrf_spritegroup.h"
 #include "newgrf_cargo.h"
 #include "date.h"
 #include "helpers.hpp"
+#include "cargotype.h"
-/* Default cargo classes */
-static const uint16 _cargo_classes[NUM_GLOBAL_CID] = {
-	CC_PASSENGERS,
-	CC_BULK,
-	CC_MAIL,
-	CC_LIQUID,
-	CC_PIECE_GOODS,
-	CC_EXPRESS,
-	CC_BULK,
-	CC_PIECE_GOODS,
-	CC_BULK,
-	CC_PIECE_GOODS,
-	CC_ARMOURED,
-	CC_PIECE_GOODS,
-	CC_REFRIGERATED | CC_EXPRESS,
-	CC_REFRIGERATED | CC_EXPRESS,
-	CC_BULK,
-	CC_LIQUID,
-	CC_LIQUID,
-	CC_BULK,
-	CC_PIECE_GOODS,
-	CC_PIECE_GOODS,
-	CC_EXPRESS,
-	CC_BULK,
-	CC_LIQUID,
-	CC_BULK,
-	CC_PIECE_GOODS,
-	CC_LIQUID,
-	CC_PIECE_GOODS,
-	CC_PIECE_GOODS,
-	CC_NOAVAILABLE,
-	CC_NOAVAILABLE,
-	CC_NOAVAILABLE,
-};
 int _traininfo_vehicle_pitch = 0;
 int _traininfo_vehicle_width = 29;
 typedef struct WagonOverride {
 {
 	WagonOverrides *wos;
 	WagonOverride *wo;
 	assert(engine < TOTAL_NUM_ENGINES);
-	assert(cargo < NUM_GLOBAL_CID);
+	assert(cargo < NUM_CARGO + 1); // Include CT_DEFAULT pseudo cargo. CT_PURCHASE does not apply to overrides.
 	wos = &_engine_wagon_overrides[engine];
 	wos->overrides_count++;
 	wos->overrides = ReallocT(wos->overrides, wos->overrides_count);
 	for (i = 0; i < wos->overrides_count; i++) {
 		const WagonOverride *wo = &wos->overrides[i];
 		int j;
 		for (j = 0; j < wo->trains; j++) {
-			if (wo->train_id[j] == overriding_engine && (wo->cargo == cargo || wo->cargo == GC_DEFAULT)) return wo->group;
+			if (wo->train_id[j] == overriding_engine && (wo->cargo == cargo || wo->cargo == CT_DEFAULT)) return wo->group;
 		}
 	}
 	return NULL;
 }
 		wos->overrides_count = 0;
 		wos->overrides = NULL;
 	}
 }
-// 0 - 28 are cargos, 29 is default, 30 is the advert (purchase list)
+/* Space for NUM_CARGO real cargos and 2 pseudo cargos, CT_DEFAULT and CT_PURCHASE */
-// (It isn't and shouldn't be like this in the GRF files since new cargo types
+static const SpriteGroup *_engine_custom_sprites[TOTAL_NUM_ENGINES][NUM_CARGO + 2];
-// may appear in future - however it's more convenient to store it like this in
-// memory. --pasky)
-static const SpriteGroup *engine_custom_sprites[TOTAL_NUM_ENGINES][NUM_GLOBAL_CID];
 static const GRFFile *_engine_grf[TOTAL_NUM_ENGINES];
 void SetCustomEngineSprites(EngineID engine, byte cargo, const SpriteGroup *group)
 {
-	assert(engine < TOTAL_NUM_ENGINES);
+	assert(engine < lengthof(_engine_custom_sprites));
-	assert(cargo < NUM_GLOBAL_CID);
+	assert(cargo < lengthof(*_engine_custom_sprites));
-	if (engine_custom_sprites[engine][cargo] != NULL) {
+	if (_engine_custom_sprites[engine][cargo] != NULL) {
 		grfmsg(6, "SetCustomEngineSprites: engine %d cargo %d already has group -- replacing", engine, cargo);
 	}
-	engine_custom_sprites[engine][cargo] = group;
+	_engine_custom_sprites[engine][cargo] = group;
 }
 /**
 * Unload all engine sprite groups.
 */
 void UnloadCustomEngineSprites(void)
 {
-	EngineID engine;
+	memset(_engine_custom_sprites, 0, sizeof(_engine_custom_sprites));
-	CargoID cargo;
+	memset(_engine_grf, 0, sizeof(_engine_grf));
-	for (engine = 0; engine < TOTAL_NUM_ENGINES; engine++) {
-		for (cargo = 0; cargo < NUM_GLOBAL_CID; cargo++) {
-			engine_custom_sprites[engine][cargo] = NULL;
-		}
-		_engine_grf[engine] = 0;
-	}
 }
 static const SpriteGroup *heli_rotor_custom_sprites[NUM_AIRCRAFT_ENGINES];
 /** Load a rotor override sprite group for an aircraft */
 		case 0x42: { /* Consist cargo information */
 			/* XXX Missing support for common refit cycle and property 25 */
 			const Vehicle *u;
 			byte cargo_classes = 0;
 			uint common_cargo_best = 0;
-			uint common_cargos[NUM_GLOBAL_CID];
+			uint common_cargos[NUM_CARGO];
 			byte user_def_data = 0;
-			CargoID cargo;
+			CargoID common_cargo_type = CT_PASSENGERS;
-			CargoID common_cargo_type = GC_PASSENGERS;
 			/* Reset our arrays */
 			memset(common_cargos, 0, sizeof(common_cargos));
 			for (u = v; u != NULL; u = u->next) {
 				/* Skip empty engines */
 				if (u->cargo_cap == 0) continue;
-				/* Map from climate to global cargo ID */
-				cargo = _global_cargo_id[_opt.landscape][u->cargo_type];
+				cargo_classes |= GetCargo(u->cargo_type)->classes;
-				cargo_classes |= _cargo_classes[cargo];
+				common_cargos[u->cargo_type]++;
-				common_cargos[cargo]++;
 				user_def_data |= RailVehInfo(u->engine_type)->user_def_data;
 			}
 			/* Pick the most common cargo type */
-			for (cargo = 0; cargo < NUM_GLOBAL_CID; cargo++) {
+			for (CargoID cargo = 0; cargo < NUM_CARGO; cargo++) {
 				if (common_cargos[cargo] > common_cargo_best) {
 					common_cargo_best = common_cargos[cargo];
-					common_cargo_type = cargo;
+					common_cargo_type = GetCargo(cargo)->bitnum;
 				}
 			}
 			return cargo_classes | (common_cargo_type << 8) | (user_def_data << 24);
 		}
 			 * tt - the cargo type transported by the vehicle,
 			 *     translated if a translation table has been installed.
 			 * ww - cargo unit weight in 1/16 tons, same as cargo prop. 0F.
 			 * cccc - the cargo class value of the cargo transported by the vehicle.
 			 */
-			CargoID cid = _global_cargo_id[_opt.landscape][v->cargo_type];
+			const CargoSpec *cs = GetCargo(v->cargo_type);
-			return (_cargo_classes[cid] << 16) | (_cargoc.weights[v->cargo_type] << 8) | cid;
+			return (cs->classes << 16) | (cs->weight << 8) | GetEngineGRF(v->engine_type)->cargo_map[v->cargo_type];
 		}
 		case 0x48: return GetVehicleTypeInfo(v->engine_type); /* Vehicle Type Info */
 		/* Variables which use the parameter */
 {
 	const SpriteGroup *group;
 	CargoID cargo;
 	if (v == NULL) {
-		cargo = GC_PURCHASE;
+		cargo = CT_PURCHASE;
 	} else {
-		cargo = _global_cargo_id[_opt.landscape][v->cargo_type];
+		cargo = v->cargo_type;
-		assert(cargo != GC_INVALID);
 		if (v->type == VEH_Train) {
 			group = GetWagonOverrideSpriteSet(engine, cargo, v->u.rail.first_engine);
 			if (group != NULL) return group;
 		}
 	}
-	group = engine_custom_sprites[engine][cargo];
+	group = _engine_custom_sprites[engine][cargo];
 	if (group != NULL) return group;
 	/* Fall back to the default set if the selected cargo type is not defined */
-	return engine_custom_sprites[engine][GC_DEFAULT];
+	return _engine_custom_sprites[engine][CT_DEFAULT];
 }
 SpriteID GetCustomEngineSprite(EngineID engine, const Vehicle *v, Direction direction)
 {
 * @return true if it is using an override, false otherwise
 */
 bool UsesWagonOverride(const Vehicle* v)
 {
 	assert(v->type == VEH_Train);
-	return GetWagonOverrideSpriteSet(v->engine_type, _global_cargo_id[_opt.landscape][v->cargo_type], v->u.rail.first_engine) != NULL;
+	return GetWagonOverrideSpriteSet(v->engine_type, v->cargo_type, v->u.rail.first_engine) != NULL;
 }
 /**
 * Evaluate a newgrf callback for vehicles
 * @param callback The callback to evalute

branch	cpp_gui
changeset 6268	4b5241e5dd10
parent 6254	abc6ad7c035c
child 6285	187e3ef04cc9