1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00

Synchronization with trunk (again), elimination of some warnings

This commit is contained in:
paracelsus
2013-03-07 19:17:23 +00:00
parent 2ad2fc83f1
commit 9ec431c37b
41 changed files with 677 additions and 538 deletions

View File

@ -3467,7 +3467,7 @@ void CBonusSelection::updateBonusSelection()
desc = CGI->generaltexth->allTexts[715];
std::string substitute; //text to be printed instead of %s
for (int v=0; v<toPrint.size(); ++v)
for (size_t v=0; v<toPrint.size(); ++v)
{
substitute += boost::lexical_cast<std::string>(toPrint[v].second);
substitute += " " + CGI->generaltexth->primarySkillNames[toPrint[v].first];