浏览代码

Rename constant

nordsoft 2 年之前
父节点
当前提交
7996123dfa
共有 3 个文件被更改,包括 4 次插入4 次删除
  1. 1 1
      lib/CTownHandler.cpp
  2. 1 1
      lib/GameConstants.h
  3. 2 2
      lib/mapObjects/CGTownInstance.cpp

+ 1 - 1
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);
 		}
 	}

+ 1 - 1
lib/GameConstants.h

@@ -582,7 +582,7 @@ namespace BuildingSubID
 		LIGHTHOUSE,
 		TREASURY,
 		CUSTOM_VISITING_BONUS,
-		CONFIGURABLE_REWARD
+		CUSTOM_VISITING_REWARD
 	};
 }
 

+ 2 - 2
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);
 }
 /*