mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: replace C-style string building with C++-style building

pull/10963/head
Rubidium 2023-06-05 17:09:20 +02:00 committed by rubidium42
parent ca1e34c121
commit 1fa432ca92
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/network/network_content_gui.cpp
View File

@ -741,8 +741,7 @@ public:
if (!this->selected->dependencies.empty()) { if (!this->selected->dependencies.empty()) {
/* List dependencies */ /* List dependencies */
char buf[DRAW_STRING_BUFFER] = ""; std::string buf;
char *p = buf;
for (auto &cid : this->selected->dependencies) { for (auto &cid : this->selected->dependencies) {
/* Try to find the dependency */ /* Try to find the dependency */
ConstContentIterator iter = _network_content_client.Begin(); ConstContentIterator iter = _network_content_client.Begin();
@ -750,7 +749,8 @@ public:
const ContentInfo *ci = *iter; const ContentInfo *ci = *iter;
if (ci->id != cid) continue; if (ci->id != cid) continue;
p += seprintf(p, lastof(buf), p == buf ? "%s" : ", %s", (*iter)->name.c_str()); if (!buf.empty()) buf += ", ";
buf += (*iter)->name;
break; break;
} }
} }
@ -760,10 +760,10 @@ public:
if (!this->selected->tags.empty()) { if (!this->selected->tags.empty()) {
/* List all tags */ /* List all tags */
char buf[DRAW_STRING_BUFFER] = ""; std::string buf;
char *p = buf;
for (auto &tag : this->selected->tags) { for (auto &tag : this->selected->tags) {
p += seprintf(p, lastof(buf), p == buf ? "%s" : ", %s", tag.c_str()); if (!buf.empty()) buf += ", ";
buf += tag;
} }
SetDParamStr(0, buf); SetDParamStr(0, buf);
tr.top = DrawStringMultiLine(tr, STR_CONTENT_DETAIL_TAGS); tr.top = DrawStringMultiLine(tr, STR_CONTENT_DETAIL_TAGS);
@ -774,14 +774,14 @@ public:
ConstContentVector tree; ConstContentVector tree;
_network_content_client.ReverseLookupTreeDependency(tree, this->selected); _network_content_client.ReverseLookupTreeDependency(tree, this->selected);
char buf[DRAW_STRING_BUFFER] = ""; std::string buf;
char *p = buf;
for (const ContentInfo *ci : tree) { for (const ContentInfo *ci : tree) {
if (ci == this->selected || ci->state != ContentInfo::SELECTED) continue; if (ci == this->selected || ci->state != ContentInfo::SELECTED) continue;
p += seprintf(p, lastof(buf), buf == p ? "%s" : ", %s", ci->name.c_str()); if (!buf.empty()) buf += ", ";
buf += ci->name;
} }
if (p != buf) { if (!buf.empty()) {
SetDParamStr(0, buf); SetDParamStr(0, buf);
tr.top = DrawStringMultiLine(tr, STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF); tr.top = DrawStringMultiLine(tr, STR_CONTENT_DETAIL_SELECTED_BECAUSE_OF);
} }