Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Use NLMISC::toString instead of sprintf

Browse source
This commit is contained in:
kervala 2016-12-18 14:03:29 +01:00
parent 525ec6b487
commit b87ce2c134
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/nel/src/3d/zone_search.cpp
View file

@ -61,8 +61,6 @@ CZoneSearch::CZoneSearch()
*/ */
pair<string, uint32> CZoneSearch::getZoneName(uint x, uint y, uint cx, uint cy) pair<string, uint32> CZoneSearch::getZoneName(uint x, uint y, uint cx, uint cy)
{ {
char name[13];
uint zoneY = y / _SizeZoneY + 1; uint zoneY = y / _SizeZoneY + 1;
uint zoneX = x / _SizeZoneX; uint zoneX = x / _SizeZoneX;
@ -74,9 +72,7 @@ pair<string, uint32> CZoneSearch::getZoneName(uint x, uint y, uint cx, uint cy)
char firstLetter = zoneX / 26 + 'A'; char firstLetter = zoneX / 26 + 'A';
char secondLetter = zoneX % 26 + 'A'; char secondLetter = zoneX % 26 + 'A';
sprintf(name, "%d_%c%c.zonel", zoneY, firstLetter, secondLetter); return std::pair<string, uint32>(NLMISC::toString("%u_%c%c.zonel", zoneY, firstLetter, secondLetter), distance);
return std::pair<string, uint32>(string(name), distance);
} }
@ -214,12 +210,9 @@ void CZoneSearch::getListZoneId (uint x, uint y, uint sizeArea, vector<uint16> &
std::string CZoneSearch::getZoneNameFromId (uint16 zoneid) std::string CZoneSearch::getZoneNameFromId (uint16 zoneid)
{ {
char name[16];
sint x = zoneid & 255; sint x = zoneid & 255;
sint y = zoneid >> 8; sint y = zoneid >> 8;
sprintf (name, "%d_%c%c.zonel", y+1, (char)('A'+(x/26)), (char)('A'+(x%26))); return NLMISC::toString("%d_%c%c.zonel", y + 1, (char)('A' + (x / 26)), (char)('A' + (x % 26)));
return string(name);
} }