cpp/openttd-patchpack/source Changeset - r25690:9d9403185243

Changeset - r25690:9d9403185243

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium42 - 3 years ago 2021-06-14 14:16:10
rubidium@openttd.org

Codechange: [Network] Use std::string instead of char[] for the name of the file that is downloading

2 files changed with 4 insertions and 4 deletions:

src/network/network_content_gui.cpp

src/network/network_content_gui.h

0 comments (0 inline, 0 general)

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -131,7 +131,7 @@ void BaseNetworkContentDownloadStatusWin @@
 	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 BaseNetworkContentDownloadStatusWin @@
 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++;
+	}

src/network/network_content_gui.h

➞

Show inline comments

@@ @@ -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:
 	/**

0 comments (0 inline, 0 general)