1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00

- wrokaround/fix for #1177

- removed assert in Fonts.cpp (can be triggered a lot by old pregame\battles code)
- fixed battle console text positioning
- fixed some new compiler warnings
This commit is contained in:
Ivan Savenko
2013-01-20 22:49:34 +00:00
parent a96f03e947
commit 46eb0b3daf
13 changed files with 24 additions and 30 deletions

View File

@ -4390,8 +4390,8 @@ void CArtPlace::setArtifact(const CArtifactInstance *art)
// so we want to replace text in [...] with a spell name
// however other language versions don't have name placeholder at all, so we have to be careful
int spellID = art->getGivenSpellID();
int nameStart = text.find_first_of('[');
int nameEnd = text.find_first_of(']', nameStart);
size_t nameStart = text.find_first_of('[');
size_t nameEnd = text.find_first_of(']', nameStart);
if(spellID >= 0)
{
if(nameStart != std::string::npos && nameEnd != std::string::npos)