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

Show content preview only for Witch Huts / Shrines / Tree

Browse Source
This commit is contained in:
Ivan Savenko
2023-10-19 15:17:58 +03:00
parent e0f6b582f5
commit 8f4791914e
7 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mapObjects/CRewardableObject.cpp
View File

@@ -58,6 +58,9 @@ std::vector<Component> CRewardableObject::loadComponents(const CGHeroInstance *
if (rewardIndices.empty())
return result;
if (!configuration.showScoutedPreview)
return result;
if (configuration.selectMode != Rewardable::SELECT_FIRST)
{
for (auto index : rewardIndices)
@@ -300,10 +303,13 @@ std::string CRewardableObject::getDescriptionMessage(PlayerColor player, const C
return configuration.description.toString();
auto rewardIndices = getAvailableRewards(hero, Rewardable::EEventType::EVENT_FIRST_VISIT);
if (rewardIndices.empty())
if (rewardIndices.empty() && !configuration.info[0].description.empty())
return configuration.info[0].description.toString();
return configuration.info[rewardIndices.front()].description.toString();
if (!configuration.info[rewardIndices.front()].description.empty())
return configuration.info[rewardIndices.front()].description.toString();
return configuration.description.toString();
}
std::vector<Component> CRewardableObject::getPopupComponentsImpl(PlayerColor player, const CGHeroInstance * hero) const