瀏覽代碼

Apply suggestions from code review

Commit code review changes

Co-authored-by: Ivan Savenko <[email protected]>

Dydzio 2 年之前
父節點
當前提交
8604bde69e
共有 2 個文件被更改,包括 5 次插入8 次删除
  1. 4 6
      lib/CModHandler.cpp
  2. 1 2
      lib/mapObjects/CGHeroInstance.cpp

+ 4 - 6
lib/CModHandler.cpp

@@ -768,14 +768,12 @@ void CModHandler::loadConfigFromFile (std::string name)
 	logMod->debug("\tDEFENSE_POINTS_DMG_MULTIPLIER_CAP\t%f", settings.DEFENSE_POINTS_DMG_MULTIPLIER_CAP);
 
 	settings.HERO_STARTING_ARMY_STACKS_COUNT_CHANCES = hardcodedFeatures["HERO_STARTING_ARMY_STACKS_COUNT_CHANCES"].convertTo<std::vector<int32_t>>();
-	std::vector<std::string> stackChangesStringVector;
-	boost::range::transform(settings.HERO_STARTING_ARMY_STACKS_COUNT_CHANCES, std::back_inserter(stackChangesStringVector), [](int element) { return std::to_string(element); });
-	logMod->debug("\tHERO_STARTING_ARMY_STACKS_COUNT_CHANCES\t%s", boost::algorithm::join(stackChangesStringVector, ", "));
+	for (auto const & entry : settings.HERO_STARTING_ARMY_STACKS_COUNT_CHANCES)
+		logMod->debug("\tHERO_STARTING_ARMY_STACKS_COUNT_CHANCES\t%d", entry);
 
 	settings.DEFAULT_BUILDING_SET_DWELLING_CHANCES = hardcodedFeatures["DEFAULT_BUILDING_SET_DWELLING_CHANCES"].convertTo<std::vector<int32_t>>();
-	std::vector<std::string> buildingChangesStringVector;
-	boost::range::transform(settings.DEFAULT_BUILDING_SET_DWELLING_CHANCES, std::back_inserter(buildingChangesStringVector), [](int element) { return std::to_string(element); });
-	logMod->debug("\tDEFAULT_BUILDING_SET_DWELLING_CHANCES\t%s", boost::algorithm::join(buildingChangesStringVector, ", "));
+	for (auto const & entry : settings.DEFAULT_BUILDING_SET_DWELLING_CHANCES)
+		logMod->debug("\tDEFAULT_BUILDING_SET_DWELLING_CHANCES\t%d", entry);
 
 	const JsonNode & gameModules = settings.data["modules"];
 	modules.STACK_EXP = gameModules["STACK_EXPERIENCE"].Bool();

+ 1 - 2
lib/mapObjects/CGHeroInstance.cpp

@@ -348,7 +348,6 @@ void CGHeroInstance::initArmy(CRandomGenerator & rand, IArmyDescriptor * dst)
 	if(!dst)
 		dst = this;
 
-	int howManyStacks = 7; //how many stacks will hero receives <1 - 7>
 	int warMachinesGiven = 0;
 
 	std::vector<int32_t> stacksCountChances = VLC->modh->settings.HERO_STARTING_ARMY_STACKS_COUNT_CHANCES;
@@ -364,7 +363,7 @@ void CGHeroInstance::initArmy(CRandomGenerator & rand, IArmyDescriptor * dst)
 	if(stacksCountElementIndex == -1)
 		stacksCountElementIndex = stacksCountChances.size();
 
-	howManyStacks = stacksCountElementIndex;
+	int howManyStacks = stacksCountElementIndex;
 	if(!allowZeroStacksArmy)
 		howManyStacks++;