From 7996123dfa5dfbebc454d2e88ed1f4be34ae44f9 Mon Sep 17 00:00:00 2001 From: nordsoft Date: Tue, 2 May 2023 14:45:53 +0400 Subject: [PATCH] Rename constant --- lib/CTownHandler.cpp | 2 +- lib/GameConstants.h | 2 +- lib/mapObjects/CGTownInstance.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/CTownHandler.cpp b/lib/CTownHandler.cpp index f8be58a7d..505e37ff9 100644 --- a/lib/CTownHandler.cpp +++ b/lib/CTownHandler.cpp @@ -631,7 +631,7 @@ void CTownHandler::loadBuilding(CTown * town, const std::string & stringID, cons if(source["type"].String() == "configurable" && ret->subId == BuildingSubID::NONE) { - ret->subId = BuildingSubID::CONFIGURABLE_REWARD; + ret->subId = BuildingSubID::CUSTOM_VISITING_REWARD; ret->rewardableObjectInfo.init(source); } } diff --git a/lib/GameConstants.h b/lib/GameConstants.h index 6042f1332..3d869d12f 100644 --- a/lib/GameConstants.h +++ b/lib/GameConstants.h @@ -582,7 +582,7 @@ namespace BuildingSubID LIGHTHOUSE, TREASURY, CUSTOM_VISITING_BONUS, - CONFIGURABLE_REWARD + CUSTOM_VISITING_REWARD }; } diff --git a/lib/mapObjects/CGTownInstance.cpp b/lib/mapObjects/CGTownInstance.cpp index 464ac58c1..cd23d2db7 100644 --- a/lib/mapObjects/CGTownInstance.cpp +++ b/lib/mapObjects/CGTownInstance.cpp @@ -391,7 +391,7 @@ void CGTownInstance::addTownBonuses(CRandomGenerator & rand) if(kvp.second->IsWeekBonus()) bonusingBuildings.push_back(new COPWBonus(kvp.second->bid, kvp.second->subId, this)); - if(kvp.second->subId == BuildingSubID::CONFIGURABLE_REWARD) + if(kvp.second->subId == BuildingSubID::CUSTOM_VISITING_REWARD) bonusingBuildings.push_back(new CTownRewardableBuilding(kvp.second->bid, kvp.second->subId, this, rand)); } } @@ -568,7 +568,7 @@ void CGTownInstance::newTurn(CRandomGenerator & rand) const } } - for(const auto * rewardableBuilding : getBonusingBuildings(BuildingSubID::CONFIGURABLE_REWARD)) + for(const auto * rewardableBuilding : getBonusingBuildings(BuildingSubID::CUSTOM_VISITING_REWARD)) rewardableBuilding->newTurn(rand); } /*