From f250880c69639cfc6f90c89baa598d8804dc92d4 Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Mon, 15 Feb 2010 13:19:13 +0000 Subject: [PATCH] - minor fixes (363, 365, 371) --- client/CCastleInterface.cpp | 2 +- hch/CHeroHandler.cpp | 2 +- lib/map.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/CCastleInterface.cpp b/client/CCastleInterface.cpp index 996cdbcd8..6fd0cf365 100644 --- a/client/CCastleInterface.cpp +++ b/client/CCastleInterface.cpp @@ -1125,7 +1125,7 @@ void CCastleInterface::CCreaInfo::clickRight(tribool down, bool previousState) int summ=0, cnt=0; int level=(bid-30)%CREATURES_PER_TOWN; std::string descr=CGI->generaltexth->allTexts[589];//Growth of creature is number - boost::algorithm::replace_first(descr,"%s",CGI->creh->creatures[crid].namePl); + boost::algorithm::replace_first(descr,"%s",CGI->creh->creatures[crid].nameSing); boost::algorithm::replace_first(descr,"%d", boost::lexical_cast( ci->town->creatureGrowth(level))); diff --git a/hch/CHeroHandler.cpp b/hch/CHeroHandler.cpp index 8b838238a..5ae43eae1 100644 --- a/hch/CHeroHandler.cpp +++ b/hch/CHeroHandler.cpp @@ -227,7 +227,7 @@ void CHeroHandler::loadPuzzleInfo() suffix << std::setfill('0') << std::setw(2); suffix << g << ".BMP"; - static const std::string factionToInfix[F_NUMBER] = {"CAS", "TOW", "RAM", "INF", "NEC", "DUN", "STR", "FOR", "ELE"}; + static const std::string factionToInfix[F_NUMBER] = {"CAS", "RAM", "TOW", "INF", "NEC", "DUN", "STR", "FOR", "ELE"}; spi.filename = "PUZ" + factionToInfix[fct] + suffix.str(); puzzleInfo[fct].push_back(spi); diff --git a/lib/map.cpp b/lib/map.cpp index dcde39850..6c8d7aa72 100644 --- a/lib/map.cpp +++ b/lib/map.cpp @@ -149,7 +149,7 @@ static CCreatureSet readCreatureSet(const unsigned char * bufor, int &i, int num std::pair ins; for(int ir=0;ir65520) rettt = 65536-rettt+VLC->creh->creatures.size();//this will happens when random object has random army