games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Remove deprecated usage of sprintf

Browse Source
This commit is contained in:
Ivan Savenko 2022-12-25 14:04:12 +02:00
parent 405b2976d5
commit 94597e7af6
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/HeroBonus.cpp
View File

@ -663,9 +663,7 @@ int IBonusBearer::valOfBonuses(Bonus::BonusType type, const CSelector &selector)
int IBonusBearer::valOfBonuses(Bonus::BonusType type, int subtype) const int IBonusBearer::valOfBonuses(Bonus::BonusType type, int subtype) const
{ {
//This part is performance-critical //This part is performance-critical
std::string cachingStr = "type_" + std::to_string(int(type)) + "_" + std::to_string(subtype);
char cachingStr[20] = {};
std::sprintf(cachingStr, "type_%ds_%d", (int)type, subtype);
CSelector s = Selector::type()(type); CSelector s = Selector::type()(type);
if(subtype != -1) if(subtype != -1)
@ -694,8 +692,7 @@ bool IBonusBearer::hasBonus(const CSelector &selector, const CSelector &limit, c
bool IBonusBearer::hasBonusOfType(Bonus::BonusType type, int subtype) const bool IBonusBearer::hasBonusOfType(Bonus::BonusType type, int subtype) const
{ {
//This part is performance-ciritcal //This part is performance-ciritcal
char cachingStr[20] = {}; std::string cachingStr = "type_" + std::to_string(int(type)) + "_" + std::to_string(subtype);
std::sprintf(cachingStr, "type_%ds_%d", (int)type, subtype);
CSelector s = Selector::type()(type); CSelector s = Selector::type()(type);
if(subtype != -1) if(subtype != -1)

8
lib/int3.h
View File

@ -161,10 +161,12 @@ public:
std::string toString() const std::string toString() const
{ {
//Performance is important here //Performance is important here
char str[16] = {}; std::string result = "{" +
std::sprintf(str, "(%d %d %d)", x, y, z); std::to_string(x) + " " +
std::to_string(y) + " " +
std::to_string(z) + "}";
return std::string(str); return result;
} }
bool valid() const //Should be named "isValid"? bool valid() const //Should be named "isValid"?