Code review: Rename variables and change type

Author: ottml

libs/s25main/AddonHelperFunctions.h

@@ -16,16 +16,16 @@ std::function<bool(const GoodType type)> makeIsUnusedWare(const GlobalGameSettin
 std::function<bool(const Job job)> makeIsUnusedJob(const GlobalGameSettings& ggs);
 
 // Only used for deserialization, can be removed when breaking compatibility (GetGameDataVersion)
-constexpr int leatherAddonBuildings = 3;
-constexpr int wineAddonBuildings = 3;
-constexpr int wineAndLeatherAddonBuildings = wineAddonBuildings + leatherAddonBuildings;
+constexpr auto numLeatherAddonBuildings = 3u;
+constexpr auto numWineAddonBuildings = 3u;
+constexpr auto numWineAndLeatherAddonBuildings = numWineAddonBuildings + numLeatherAddonBuildings;
 
-constexpr int leatherAddonGoods = 3;
-constexpr int wineAddonGoods = 2;
-constexpr int wineAndLeatherAddonGoods = wineAddonGoods + leatherAddonGoods;
+constexpr auto numLeatherAddonGoods = 3u;
+constexpr auto numWineAddonGoods = 2u;
+constexpr auto numWineAndLeatherAddonGoods = numWineAddonGoods + numLeatherAddonGoods;
 
-constexpr int leatherAddonJobs = 3;
-constexpr int wineAddonJobs = 3;
-constexpr int wineAndLeatherAddonJobs = wineAddonJobs + leatherAddonJobs;
+constexpr auto numLeatherAddonJobs = 3u;
+constexpr auto numWineAddonJobs = 3u;
+constexpr auto numWineAndLeatherAddonJobs = numWineAddonJobs + numLeatherAddonJobs;
 
 constexpr uint8_t transportPrioOfLeatherworks = 7;

libs/s25main/GameCommands.cpp

@@ -150,7 +150,7 @@ ChangeBuildOrder::ChangeBuildOrder(Deserializer& ser)
     } else
     {
         auto countOfNotAvailableBuildingsInSaveGame =
-          ser.getDataVersion() < 1 ? wineAndLeatherAddonBuildings : leatherAddonBuildings;
+          ser.getDataVersion() < 1 ? numWineAndLeatherAddonBuildings : numLeatherAddonBuildings;
         std::vector<BuildingType> buildOrder(data.size() - countOfNotAvailableBuildingsInSaveGame);
 
         if(ser.getDataVersion() < 1)

libs/s25main/GamePlayer.cpp

@@ -301,7 +301,7 @@ void GamePlayer::Deserialize(SerializedGameData& sgd)
     if(sgd.GetGameDataVersion() < 12)
     {
         auto countOfNotAvailableBuildingsInSaveGame =
-          sgd.GetGameDataVersion() < 11 ? wineAndLeatherAddonBuildings : leatherAddonBuildings;
+          sgd.GetGameDataVersion() < 11 ? numWineAndLeatherAddonBuildings : numLeatherAddonBuildings;
         std::vector<BuildingType> build_order_raw(build_order.size() - countOfNotAvailableBuildingsInSaveGame);
         helpers::popContainer(sgd, build_order_raw, true);
 
@@ -316,7 +316,7 @@ void GamePlayer::Deserialize(SerializedGameData& sgd)
         std::copy(build_order_raw.begin(), build_order_raw.end(), build_order.begin());
 
         auto countOfNotAvailableGoodsInSaveGame =
-          sgd.GetGameDataVersion() < 11 ? wineAndLeatherAddonGoods : leatherAddonGoods;
+          sgd.GetGameDataVersion() < 11 ? numWineAndLeatherAddonGoods : numLeatherAddonGoods;
         std::vector<uint8_t> transportPrio_raw(transportPrio.size() - countOfNotAvailableGoodsInSaveGame);
         helpers::popContainer(sgd, transportPrio_raw, true);
         std::copy(transportPrio_raw.begin(), transportPrio_raw.end(), transportPrio.begin());
@@ -339,14 +339,14 @@ void GamePlayer::Deserialize(SerializedGameData& sgd)
     if(sgd.GetGameDataVersion() < 12)
     {
         auto countOfNotAvailableGoodsInSaveGame =
-          sgd.GetGameDataVersion() < 11 ? wineAndLeatherAddonGoods : leatherAddonGoods;
+          sgd.GetGameDataVersion() < 11 ? numWineAndLeatherAddonGoods : numLeatherAddonGoods;
         std::vector<unsigned int> global_inventory_good_raw(global_inventory.goods.size()
                                                             - countOfNotAvailableGoodsInSaveGame);
         helpers::popContainer(sgd, global_inventory_good_raw, true);
         std::copy(global_inventory_good_raw.begin(), global_inventory_good_raw.end(), global_inventory.goods.begin());
 
         auto countOfNotAvailableJobsInSaveGame =
-          sgd.GetGameDataVersion() < 11 ? wineAndLeatherAddonJobs : leatherAddonJobs;
+          sgd.GetGameDataVersion() < 11 ? numWineAndLeatherAddonJobs : numLeatherAddonJobs;
         std::vector<unsigned int> global_inventory_people_raw(global_inventory.people.size()
                                                               - countOfNotAvailableJobsInSaveGame);
         helpers::popContainer(sgd, global_inventory_people_raw, true);