From 52bf9982249eede48d729f91d1804cd88aa48b89 Mon Sep 17 00:00:00 2001 From: bseiller Date: Wed, 3 Feb 2021 14:32:03 +0100 Subject: [PATCH] Adapt to review comments by @PatrikLundell - survey.cpp: rename loop variable for more clarity; replace use of parmeter with use of vector.size(), replace nested vector.at calls with direct index access/subscript as it is faster and easier to read --- plugins/embark-assistant/survey.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/plugins/embark-assistant/survey.cpp b/plugins/embark-assistant/survey.cpp index fa7e9ebee..841594238 100644 --- a/plugins/embark-assistant/survey.cpp +++ b/plugins/embark-assistant/survey.cpp @@ -902,14 +902,15 @@ void embark_assist::survey::high_level_world_survey(embark_assist::defs::geo_dat //================================================================================= -void reset_mlt_inorganics(embark_assist::defs::mid_level_tiles *mlts, const uint16_t max_inorganic) { +void reset_mlt_inorganics(embark_assist::defs::mid_level_tiles &mlts) { + const uint16_t size = mlts[0][0].metals.size(); for (uint8_t i = 0; i < 16; i++) { for (uint8_t k = 0; k < 16; k++) { - embark_assist::defs::mid_level_tile &mlt = mlts->at(i).at(k); - for (uint16_t i = 0; i < max_inorganic; i++) { - mlt.metals[i] = false; - mlt.economics[i] = false; - mlt.minerals[i] = false; + embark_assist::defs::mid_level_tile &mlt = mlts[i][k]; + for (uint16_t l = 0; l < size; l++) { + mlt.metals[l] = false; + mlt.economics[l] = false; + mlt.minerals[l] = false; } } } @@ -950,7 +951,7 @@ void embark_assist::survey::survey_mid_level_tile(embark_assist::defs::geo_data tile->minerals[i] = 0; } - reset_mlt_inorganics(mlt, state->max_inorganic); + reset_mlt_inorganics(*mlt); for (uint8_t i = 1; i < 10; i++) survey_results->at(x).at(y).biome_index[i] = -1;