(svn r8849) -Codechange: Replace hardcoded global/climate cargo mapping tables with dynamically generated data. Change associated code to use new functions.

1 files changed, 23 insertions, 0 deletions

diff --git a/src/cargotype.cpp b/src/cargotype.cpp
index e17bff0ef..0cfd7e2e9 100644
--- a/src/cargotype.cpp
+++ b/src/cargotype.cpp
@@ -14,6 +14,12 @@ static CargoSpec _cargo[NUM_CARGO];
 
 static const byte INVALID_CARGO = 0xFF;
 
+/* Quick mapping from cargo type 'bitnums' to real cargo IDs */
+static CargoID _cargo_bitnum_map[32];
+
+/* Bitmask of cargo type 'bitnums' availabe */
+uint32 _cargo_mask;
+
 
 void SetupCargoForClimate(LandscapeID l)
 {
@@ -23,6 +29,9 @@ void SetupCargoForClimate(LandscapeID l)
 	memset(_cargo, 0, sizeof(_cargo));
 	for (CargoID i = 0; i < lengthof(_cargo); i++) _cargo[i].bitnum = INVALID_CARGO;
 
+	memset(_cargo_bitnum_map, CT_INVALID, sizeof(_cargo_bitnum_map));
+	_cargo_mask = 0;
+
 	for (CargoID i = 0; i < lengthof(_default_climate_cargo[l]); i++) {
 		CargoLabel cl = _default_climate_cargo[l][i];
 
@@ -31,6 +40,13 @@ void SetupCargoForClimate(LandscapeID l)
 		for (uint j = 0; j < lengthof(_default_cargo); j++) {
 			if (_default_cargo[j].label == cl) {
 				_cargo[i] = _default_cargo[j];
+
+				/* Populate the bitnum map and masks */
+				byte bitnum = _cargo[i].bitnum;
+				if (bitnum < lengthof(_cargo_bitnum_map)) {
+					_cargo_bitnum_map[bitnum] = i;
+					SETBIT(_cargo_mask, bitnum);
+				}
 				break;
 			}
 		}
@@ -44,3 +60,10 @@ const CargoSpec *GetCargo(CargoID c)
 	return &_cargo[c];
 }
 
+
+CargoID GetCargoIDByBitnum(byte bitnum)
+{
+	assert(bitnum < lengthof(_cargo_bitnum_map));
+	assert(_cargo_bitnum_map[bitnum] != CT_INVALID);
+	return _cargo_bitnum_map[bitnum];
+}