diff options
| author | rubidium42 <rubidium@openttd.org> | 2021-06-14 16:16:10 +0200 |
|---|---|---|
| committer | rubidium42 <rubidium42@users.noreply.github.com> | 2021-06-15 06:13:00 +0200 |
| commit | 05005dcdfa4f2d0c8fe2e0f0a92103dccd4691ab (patch) | |
| tree | d041ef69332157bb7b166007812bd3033a03b44d | |
| parent | 981cd0197a8f180dd3a29e83d1c088dcb52e4920 (diff) | |
| download | openttd-05005dcdfa4f2d0c8fe2e0f0a92103dccd4691ab.tar.xz | |
Codechange: [Network] Use std::string instead of char[] for the name of the file that is downloading
| -rw-r--r-- | src/network/network_content_gui.cpp | 4 | ||||
| -rw-r--r-- | src/network/network_content_gui.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp index dfd4370b3..483e2b527 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -131,7 +131,7 @@ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, int widge StringID str; if (this->downloaded_bytes == this->total_bytes) { str = STR_CONTENT_DOWNLOAD_COMPLETE; - } else if (!StrEmpty(this->name)) { + } else if (!this->name.empty()) { SetDParamStr(0, this->name); SetDParam(1, this->downloaded_files); SetDParam(2, this->total_files); @@ -147,7 +147,7 @@ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, int widge void BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(const ContentInfo *ci, int bytes) { if (ci->id != this->cur_id) { - strecpy(this->name, ci->filename.c_str(), lastof(this->name)); + this->name = ci->filename; this->cur_id = ci->id; this->downloaded_files++; } diff --git a/src/network/network_content_gui.h b/src/network/network_content_gui.h index dd9d9cfdf..54fbcc36b 100644 --- a/src/network/network_content_gui.h +++ b/src/network/network_content_gui.h @@ -22,8 +22,8 @@ protected: uint total_files; ///< Number of files to download uint downloaded_files; ///< Number of files downloaded - uint32 cur_id; ///< The current ID of the downloaded file - char name[48]; ///< The current name of the downloaded file + uint32 cur_id; ///< The current ID of the downloaded file + std::string name; ///< The current name of the downloaded file public: /** |