games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

market->getObjInstanceID()

Browse Source
This commit is contained in:
SoundSSGood
2024-08-20 17:15:50 +03:00
parent 58bb2b58e3
commit 2e3e6b1553
27 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/IMarket.cpp
View File

@@ -22,7 +22,7 @@ VCMI_LIB_NAMESPACE_BEGIN
bool IMarket::allowsTrade(const EMarketMode mode) const
{
return marketModes.count(mode) > 0;
return vstd::contains(marketModes, mode);
}
bool IMarket::getOffer(int id1, int id2, int &val1, int &val2, EMarketMode mode) const
@@ -180,7 +180,7 @@ std::vector<TradeItemBuy> IMarket::availableItemsIds(const EMarketMode mode) con
case EMarketMode::RESOURCE_RESOURCE:
case EMarketMode::ARTIFACT_RESOURCE:
case EMarketMode::CREATURE_RESOURCE:
for (auto res : GameResID::ALL_RESOURCES())
for(const auto & res : GameResID::ALL_RESOURCES())
ret.push_back(res);
}
return ret;