dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp-beta

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-10-29 17:56:32 +01:00
parent da282c3ecc d0bcb9839a
commit 24c6dfe872
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/game_info.cpp
View File

@@ -48,7 +48,7 @@ const char *GetNetworkRevisionString()
/* Start by taking a chance on the full revision string. */ /* Start by taking a chance on the full revision string. */
network_revision = stredup(_openttd_revision); network_revision = stredup(_openttd_revision);
/* Ensure it's not longer than the packet buffer length. */ /* Ensure it's not longer than the packet buffer length. */
if (strlen(network_revision) >= NETWORK_REVISION_LENGTH) network_revision[NETWORK_REVISION_LENGTH - 1] = '\0'; if (strlen(network_revision) >= NETWORK_REVISION_LENGTH - 1) network_revision[NETWORK_REVISION_LENGTH - 1] = '\0';
/* Tag names are not mangled further. */ /* Tag names are not mangled further. */
if (_openttd_revision_tagged) { if (_openttd_revision_tagged) {

4
src/network/network_content_gui.cpp
View File

@@ -130,7 +130,7 @@ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, int widge
StringID str; StringID str;
if (this->downloaded_bytes == this->total_bytes) { if (this->downloaded_bytes == this->total_bytes) {
str = STR_CONTENT_DOWNLOAD_COMPLETE; str = STR_CONTENT_DOWNLOAD_COMPLETE;
} else if (!StrEmpty(this->name)) { } else if (!this->name.empty()) {
SetDParamStr(0, this->name); SetDParamStr(0, this->name);
SetDParam(1, this->downloaded_files); SetDParam(1, this->downloaded_files);
SetDParam(2, this->total_files); SetDParam(2, this->total_files);
@@ -146,7 +146,7 @@ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, int widge
void BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(const ContentInfo *ci, int bytes) void BaseNetworkContentDownloadStatusWindow::OnDownloadProgress(const ContentInfo *ci, int bytes)
{ {
if (ci->id != this->cur_id) { 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->cur_id = ci->id;
this->downloaded_files++; this->downloaded_files++;
} }

4
src/network/network_content_gui.h
View File

@@ -22,8 +22,8 @@ protected:
uint total_files; ///< Number of files to download uint total_files; ///< Number of files to download
uint downloaded_files; ///< Number of files downloaded uint downloaded_files; ///< Number of files downloaded
uint32 cur_id; ///< The current ID of the downloaded file uint32 cur_id; ///< The current ID of the downloaded file
char name[48]; ///< The current name of the downloaded file std::string name; ///< The current name of the downloaded file
public: public:
/** /**

2
src/network/network_gui.cpp
View File

@@ -1909,7 +1909,7 @@ private:
if (_network_server) this->buttons[line_count].emplace_back(new CompanyButton(SPR_ADMIN, STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP, COLOUR_RED, company_id, &NetworkClientListWindow::OnClickCompanyAdmin, company_id == COMPANY_SPECTATOR)); if (_network_server) this->buttons[line_count].emplace_back(new CompanyButton(SPR_ADMIN, STR_NETWORK_CLIENT_LIST_ADMIN_COMPANY_TOOLTIP, COLOUR_RED, company_id, &NetworkClientListWindow::OnClickCompanyAdmin, company_id == COMPANY_SPECTATOR));
this->buttons[line_count].emplace_back(chat_button); this->buttons[line_count].emplace_back(chat_button);
if (own_ci->client_playas != company_id) this->buttons[line_count].emplace_back(new CompanyButton(SPR_JOIN, STR_NETWORK_CLIENT_LIST_JOIN_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::OnClickCompanyJoin)); if (own_ci->client_playas != company_id) this->buttons[line_count].emplace_back(new CompanyButton(SPR_JOIN, STR_NETWORK_CLIENT_LIST_JOIN_TOOLTIP, COLOUR_ORANGE, company_id, &NetworkClientListWindow::OnClickCompanyJoin, company_id != COMPANY_SPECTATOR && Company::Get(company_id)->is_ai));
this->line_count += 1; this->line_count += 1;