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

Merge pull request #3180 from IvanSavenko/bugfixing

Browse Source 
Fixes for miscellaneous accumulated issues
This commit is contained in:
Ivan Savenko
2023-11-13 16:26:33 +02:00
committed by GitHub
parent c6f9434c8e 9c9127be7d
commit 1192dbff15
14 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/ArtifactUtils.cpp
View File

@@ -255,10 +255,13 @@ DLL_LINKAGE void ArtifactUtils::insertScrrollSpellName(std::string & description
// However other language versions don't have name placeholder at all, so we have to be careful
auto nameStart = description.find_first_of('[');
auto nameEnd = description.find_first_of(']', nameStart);
if(sid.getNum() >= 0)
if(nameStart != std::string::npos && nameEnd != std::string::npos)
{
if(nameStart != std::string::npos && nameEnd != std::string::npos)
if(sid.getNum() >= 0)
description = description.replace(nameStart, nameEnd - nameStart + 1, sid.toEntity(VLC->spells())->getNameTranslated());
else
description = description.erase(nameStart, nameEnd - nameStart + 2); // erase "[spell name] " - including space
}
}