- minor fixes (363, 365, 371)

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<std::string>(
 			ci->town->creatureGrowth(level)));
 

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);

lib/map.cpp

@@ -149,7 +149,7 @@ static CCreatureSet readCreatureSet(const unsigned char * bufor, int &i, int num
 		std::pair<ui32,si32> ins;
 		for(int ir=0;ir<number;ir++)
 		{
-			int rettt = readNormalNr(bufor,i+ir*4, 2);tlog1<<"Creature has ID "<<rettt<<"\n";
+			int rettt = readNormalNr(bufor,i+ir*4, 2);
 			if(rettt==0xffff) continue;
 			if(rettt>65520)
 				rettt = 65536-rettt+VLC->creh->creatures.size();//this will happens when random object has random army