games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

nullkiller2: Replace hasBuiltSomeTradeBuilding() with hasBuiltResourceMarketplace()

Browse Source
This commit is contained in:
Mircea TheHonestCTO
2025-11-18 18:18:35 +01:00
parent 3c7abd988e
commit 1900e03b47
7 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mapObjects/CGTownInstance.cpp
View File

@@ -651,7 +651,7 @@ BoatId CGTownInstance::getBoatType() const
int CGTownInstance::getMarketEfficiency() const
{
if(!hasBuiltSomeTradeBuilding())
if(!hasBuiltResourceMarketplace())
return 0;
const PlayerState *p = cb->getPlayerState(tempOwner);
@@ -659,7 +659,7 @@ int CGTownInstance::getMarketEfficiency() const
int marketCount = 0;
for(const CGTownInstance *t : p->getTowns())
if(t->hasBuiltSomeTradeBuilding())
if(t->hasBuiltResourceMarketplace())
marketCount++;
return marketCount;
@@ -885,9 +885,10 @@ const CArmedInstance * CGTownInstance::getUpperArmy() const
return this;
}
bool CGTownInstance::hasBuiltSomeTradeBuilding() const
bool CGTownInstance::hasBuiltResourceMarketplace() const
{
return availableModes().empty() ? false : true;
const auto modes = availableModes();
return std::find(modes.begin(), modes.end(), EMarketMode::RESOURCE_RESOURCE) != modes.end();
}
bool CGTownInstance::hasBuilt(BuildingSubID::EBuildingSubID buildingID) const

2
lib/mapObjects/CGTownInstance.h
View File

@@ -160,7 +160,7 @@ public:
GrowthInfo getGrowthInfo(int level) const;
bool hasFort() const;
bool hasCapitol() const;
bool hasBuiltSomeTradeBuilding() const;
bool hasBuiltResourceMarketplace() const;
//checks if special building with type buildingID is constructed
bool hasBuilt(BuildingSubID::EBuildingSubID buildingID) const;
//checks if building is constructed and town has same subID