games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Fix crash on right-clicking spell component in some dialogs

Browse Source
This commit is contained in:
Ivan Savenko
2024-08-21 18:19:31 +00:00
parent 6a6c13471c
commit 475a20124f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/widgets/CComponent.cpp
View File

@ -230,7 +230,7 @@ std::string CComponent::getDescription() const
return description; return description;
} }
case ComponentType::SPELL: case ComponentType::SPELL:
return VLC->spells()->getById(data.subType.as<SpellID>())->getDescriptionTranslated(data.value.value_or(0)); return VLC->spells()->getById(data.subType.as<SpellID>())->getDescriptionTranslated(std::max(0, data.value.value_or(0)));
case ComponentType::MORALE: case ComponentType::MORALE:
return CGI->generaltexth->heroscrn[ 4 - (data.value.value_or(0)>0) + (data.value.value_or(0)<0)]; return CGI->generaltexth->heroscrn[ 4 - (data.value.value_or(0)>0) + (data.value.value_or(0)<0)];
case ComponentType::LUCK: case ComponentType::LUCK:
@ -290,7 +290,7 @@ std::string CComponent::getSubtitle() const
return CGI->artifacts()->getById(data.subType.as<ArtifactID>())->getNameTranslated(); return CGI->artifacts()->getById(data.subType.as<ArtifactID>())->getNameTranslated();
case ComponentType::SPELL_SCROLL: case ComponentType::SPELL_SCROLL:
case ComponentType::SPELL: case ComponentType::SPELL:
if (data.value < 0) if (data.value.value_or(0) < 0)
return "{#A9A9A9|" + CGI->spells()->getById(data.subType.as<SpellID>())->getNameTranslated() + "}"; return "{#A9A9A9|" + CGI->spells()->getById(data.subType.as<SpellID>())->getNameTranslated() + "}";
else else
return CGI->spells()->getById(data.subType.as<SpellID>())->getNameTranslated(); return CGI->spells()->getById(data.subType.as<SpellID>())->getNameTranslated();