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

Update lib/mapObjects/CGDwelling.cpp

Browse Source 
Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>
This commit is contained in:
George King
2025-05-30 14:32:48 +02:00
committed by GitHub
parent ef6b05e3cc
commit afc52b2b76
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/mapObjects/CGDwelling.cpp
View File

@@ -255,18 +255,15 @@ void CGDwelling::onHeroVisit(IGameEventCallback & gameEvents, const CGHeroInstan
bd.player = h->tempOwner; bd.player = h->tempOwner;
if(ID == Obj::CREATURE_GENERATOR1 || ID == Obj::CREATURE_GENERATOR4) if(ID == Obj::CREATURE_GENERATOR1 || ID == Obj::CREATURE_GENERATOR4)
{ {
const size_t count = creatures.size(); const size_t count = std::min<size_t>(creatures.size(), 4);
if (count == 1) constexpr std::array dwellingVisitTextID = {
bd.text.appendLocalString(EMetaText::ADVOB_TXT, 35); // {%s} Would you like to recruit %s? "core.advevent.35", // 0 creatures, should not happen
else if (count == 2) "core.advevent.35",
bd.text.appendRawString(LIBRARY->generaltexth->translate("vcmi.adventureMap.dwelling2")); "vcmi.adventureMap.dwelling2",
else if (count == 3) "vcmi.adventureMap.dwelling3",
bd.text.appendRawString(LIBRARY->generaltexth->translate("vcmi.adventureMap.dwelling3")); "core.advevent.36"
else if (count == 4) }
bd.text.appendLocalString(EMetaText::ADVOB_TXT, 36); // {%s} Would you like to recruit %s, %s, %s, or %s? bd.text.appendTextID(dwellingVisitTextID[count]);
else
bd.text.appendLocalString(EMetaText::ADVOB_TXT, 36);
bd.text.replaceTextID(getObjectHandler()->getNameTextID()); bd.text.replaceTextID(getObjectHandler()->getNameTextID());
for(const auto & elem : creatures) for(const auto & elem : creatures)
bd.text.replaceNamePlural(elem.second[0]); bd.text.replaceNamePlural(elem.second[0]);