diff --git a/crystal.cpp b/crystal.cpp index a21cfe20..cabc916c 100644 --- a/crystal.cpp +++ b/crystal.cpp @@ -1318,9 +1318,7 @@ EX void set_crystal(int sides) { set_variation(eVariation::pure); ginf[gCrystal].sides = sides; ginf[gCrystal].vertex = 4; - static char buf[20]; - sprintf(buf, "{%d,4}", sides); - ginf[gCrystal].tiling_name = buf; + ginf[gCrystal].tiling_name = hr::format("{%d,4}", sides); ginf[gCrystal].distlimit = distlimit_table[min(sides, MAX_EDGE_CRYSTAL-1)]; } diff --git a/debug.cpp b/debug.cpp index c230b40c..9b1aba99 100644 --- a/debug.cpp +++ b/debug.cpp @@ -308,8 +308,6 @@ struct debugScreen { #if CAP_SHAPES queuepoly(gmatrix[what], cgi.shAsymmetric, 0x80808080); #endif - char buf[200]; - sprintf(buf, "%p", hr::voidp(what)); dialog::addSelItem("mpdist", its(what->mpdist), 'd'); dialog::add_action([what] () { bitfield_editor(what->mpdist, [what] (int i) { what->mpdist = 0; }, "generation level"); @@ -390,7 +388,7 @@ struct debugScreen { dialog::addBreak(50); if(show_debug_data) { - dialog::addSelItem("pointer", s0+buf+"/"+index_pointer(what), 0); + dialog::addSelItem("pointer", s0+hr::format("%p", hr::voidp(what))+"/"+index_pointer(what), 0); dialog::addSelItem("cpdist", its(what->cpdist), 0); dialog::addSelItem("celldist", its(celldist(what)), 0); dialog::addSelItem("celldistance", its(celldistance(cwt.at, what)), 0); diff --git a/help.cpp b/help.cpp index fcdeb014..150f8b95 100644 --- a/help.cpp +++ b/help.cpp @@ -586,8 +586,7 @@ EX string generateHelpForWall(eWall w) { void buteol(string& s, int current, int req) { int siz = isize(s); if(s[siz-1] == '\n') s.resize(siz-1); - char buf[100]; sprintf(buf, " (%d/%d)", current, req); - s += buf; s += "\n"; + s += hr::format(" (%d/%d)\n", current, req); } EX string generateHelpForMonster(eMonster m) { @@ -930,7 +929,7 @@ EX void describeMouseover() { } if(buggyGeneration) { - char buf[80]; sprintf(buf, " %p H=%d M=%d", hr::voidp(c), c->landparam, c->mpdist); out += buf; + out += hr::format(" %p H=%d M=%d", hr::voidp(c), c->landparam, c->mpdist); } if(randomPatternsMode) diff --git a/history.cpp b/history.cpp index 14ef4eb0..d89feaff 100644 --- a/history.cpp +++ b/history.cpp @@ -498,10 +498,7 @@ EX namespace history { pushScreen(progress_screen); - char buf[128]; - sprintf(buf, "#%03d", segid); - - progress(s0 + buf + " ("+its(j+bonus)+"/"+its(siz+bonus+bonus-1)+")"); */ + progress(s0 + hr::format("#%03d (%d/%d)", segid, j+bonus, siz+bonus+bonus-1)); */ // calcparam(); current_display->radius = bandhalf; phase = j; movetophase(); diff --git a/hprint.cpp b/hprint.cpp index f48e21a2..55aeb794 100644 --- a/hprint.cpp +++ b/hprint.cpp @@ -33,9 +33,9 @@ EX int debugflags = DF_INIT | DF_ERROR | DF_WARN | DF_MSG | DF_TIME | DF_LOG; EX string s0; -EX string its(int i) { char buf[64]; sprintf(buf, "%d", i); return buf; } +EX string its(int i) { return hr::format("%d", i); } -EX string itsh8(int i) {static char buf[16]; sprintf(buf, "%08X", i); return buf; } +EX string itsh8(int i) { return hr::format("%08X", i); } EX string fts(ld x, int prec IS(6)) { std::stringstream ss; @@ -399,9 +399,9 @@ EX string llts(long long i) { if(i < 10) return its((int) i); return llts(i/10) + its(i%10); } -EX string itsh(unsigned int i) {static char buf[16]; sprintf(buf, "%03X", i); return buf; } -EX string itsh(int i) {static char buf[16]; sprintf(buf, "%03X", i); return buf; } -EX string itsh2(int i) {static char buf[16]; sprintf(buf, "%02X", i); return buf; } +EX string itsh(unsigned int i) { return hr::format("%03X", i); } +EX string itsh(int i) { return hr::format("%03X", i); } +EX string itsh2(int i) { return hr::format("%02X", i); } EX string itsh(unsigned long long i) { int i0 = int(i); @@ -483,9 +483,7 @@ template T deserialize(const string& s) { EX string as_hexstring(string o) { string res; for(char x: o) { - char buf[4]; - sprintf(buf, "%02X", (unsigned char)(x)); - res += buf; + res += hr::format("%02X", (unsigned char)(x)); } return res; } diff --git a/mobile.cpp b/mobile.cpp index c304aaae..8cd88078 100644 --- a/mobile.cpp +++ b/mobile.cpp @@ -26,15 +26,13 @@ string buildScoreDescription() { for(int i=0; i= 'a' && x < 'a' + GDIM) return x - 'a'; diff --git a/rogueviz/dhrg/visualize.cpp b/rogueviz/dhrg/visualize.cpp index 457fd77a..6846e4e0 100644 --- a/rogueviz/dhrg/visualize.cpp +++ b/rogueviz/dhrg/visualize.cpp @@ -29,13 +29,12 @@ void show_likelihood() { for(int i=0; i>8) & 0xFFFFFF, cta(stroke), width/divby, (fill>>8) & 0xFFFFFF, cta(fill)