cpp/openttd-patchpack/source Changeset - r28021:94f16add0daf

Changeset - r28021:94f16add0daf

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

Peter Nelson - 12 months ago 2023-10-20 17:40:26
peter1138@openttd.org

Codechange: Use max_element to find best cargo (sub-)type in NewGRF var 42. (#11370)

This replaces two manual loops to find the best cargo (sub-)type.

1 file changed with 10 insertions and 25 deletions:

src/newgrf_engine.cpp

0 comments (0 inline, 0 general)

src/newgrf_engine.cpp

➞

Show inline comments

@@ @@ -432,59 +432,44 @@ static uint32_t VehicleGetVariable(Vehic @@
 				SetBit(v->grf_cache.cache_valid, NCVV_POSITION_SAME_ID_LENGTH);
+			}
 			return v->grf_cache.position_same_id_length;
 		case 0x42: { // Consist cargo information
 			if (!HasBit(v->grf_cache.cache_valid, NCVV_CONSIST_CARGO_INFORMATION)) {
-				const Vehicle *u;
+				std::array<uint8_t, NUM_CARGO> common_cargoes{};
 				byte cargo_classes = 0;
 				uint8_t common_cargoes[NUM_CARGO];
 				uint8_t common_subtypes[256];
 				byte user_def_data = 0;
 				CargoID common_cargo_type = CT_INVALID;
 				uint8_t common_subtype = 0xFF; // Return 0xFF if nothing is carried
 				/* Reset our arrays */
 				memset(common_cargoes, 0, sizeof(common_cargoes));
 				memset(common_subtypes, 0, sizeof(common_subtypes));
 				for (u = v; u != nullptr; u = u->Next()) {
 				for (const Vehicle *u = v; u != nullptr; u = u->Next()) {
 					if (v->type == VEH_TRAIN) user_def_data |= Train::From(u)->tcache.user_def_data;
 					/* Skip empty engines */
 					if (!u->GetEngine()->CanCarryCargo()) continue;
 					cargo_classes |= CargoSpec::Get(u->cargo_type)->classes;
 					common_cargoes[u->cargo_type]++;
+				}
 				/* Pick the most common cargo type */
 				uint common_cargo_best_amount = 0;
 				for (CargoID cargo = 0; cargo < NUM_CARGO; cargo++) {
 					if (common_cargoes[cargo] > common_cargo_best_amount) {
 						common_cargo_best_amount = common_cargoes[cargo];
 						common_cargo_type = cargo;
+					}
+				}
 				auto cargo_it = std::max_element(std::begin(common_cargoes), std::end(common_cargoes));
 				/* Return CT_INVALID if nothing is carried */
 				CargoID common_cargo_type = (*cargo_it == 0) ? (CargoID)CT_INVALID : static_cast<CargoID>(std::distance(std::begin(common_cargoes), cargo_it));
 				/* Count subcargo types of common_cargo_type */
 				for (u = v; u != nullptr; u = u->Next()) {
 				std::array<uint8_t, UINT8_MAX + 1> common_subtypes{};
 				for (const Vehicle *u = v; u != nullptr; u = u->Next()) {
 					/* Skip empty engines and engines not carrying common_cargo_type */
 					if (u->cargo_type != common_cargo_type || !u->GetEngine()->CanCarryCargo()) continue;
 					common_subtypes[u->cargo_subtype]++;
+				}
 				/* Pick the most common subcargo type*/
 				uint common_subtype_best_amount = 0;
 				for (uint i = 0; i < lengthof(common_subtypes); i++) {
 					if (common_subtypes[i] > common_subtype_best_amount) {
 						common_subtype_best_amount = common_subtypes[i];
 						common_subtype = i;
+					}
+				}
 				auto subtype_it = std::max_element(std::begin(common_subtypes), std::end(common_subtypes));
 				/* Return UINT8_MAX if nothing is carried */
 				uint8_t common_subtype = (*subtype_it == 0) ? UINT8_MAX : static_cast<uint8_t>(std::distance(std::begin(common_subtypes), subtype_it));
 				/* Note: We have to store the untranslated cargotype in the cache as the cache can be read by different NewGRFs,
 				 *       which will need different translations */
 				v->grf_cache.consist_cargo_information = cargo_classes | (common_cargo_type << 8) | (common_subtype << 16) | (user_def_data << 24);
 				SetBit(v->grf_cache.cache_valid, NCVV_CONSIST_CARGO_INFORMATION);
+			}

0 comments (0 inline, 0 general)