cpp/openttd-patchpack/source File Diff

File diff r25491:a3015bde6b9b → r25492:95b5ff29c101

src/network/network_gui.cpp

➞

Show inline comments

@@ @@ -1280,13 +1280,13 @@ struct NetworkLobbyWindow : public Windo @@
+	}
 	CompanyID NetworkLobbyFindCompanyIndex(byte pos) const
+	{
 		/* Scroll through all this->company_info and get the 'pos' item that is not empty. */
 		for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) {
-			if (!StrEmpty(this->company_info[i].company_name)) {
+			if (!this->company_info[i].company_name.empty()) {
 				if (pos-- == 0) return i;
+			}
+		}
 		return COMPANY_FIRST;
+	}
@@ @@ -1395,13 +1395,13 @@ struct NetworkLobbyWindow : public Windo @@
+	{
 		const int detail_height = 12 + FONT_HEIGHT_NORMAL + 12;
 		/* Draw info about selected company when it is selected in the left window. */
 		GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.top + detail_height - 1, PC_DARK_BLUE);
 		DrawString(r.left + WD_FRAMERECT_LEFT, r.right - WD_FRAMERECT_RIGHT, r.top + 12, STR_NETWORK_GAME_LOBBY_COMPANY_INFO, TC_FROMSTRING, SA_HOR_CENTER);
-		if (this->company == INVALID_COMPANY || StrEmpty(this->company_info[this->company].company_name)) return;
+		if (this->company == INVALID_COMPANY || this->company_info[this->company].company_name.empty()) return;
 		int y = r.top + detail_height + 4;
 		const NetworkGameInfo *gi = &this->server->info;
 		SetDParam(0, gi->clients_on);
 		SetDParam(1, gi->clients_max);