From 849d1fa1b303be842c6ec0f32d4a98062446b491 Mon Sep 17 00:00:00 2001
From: Rubidium <rubidium@openttd.org>
Date: Sat, 23 Mar 2024 19:43:08 +0100
Subject: [PATCH] Cleanup: remove UI for asking user for company password

---
 src/lang/english.txt           |  1 -
 src/network/network_client.cpp |  2 +-
 src/network/network_gui.cpp    | 10 ++--------
 src/network/network_gui.h      |  2 +-
 src/network/network_type.h     |  6 ------
 5 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/src/lang/english.txt b/src/lang/english.txt
index 0127b342b0..b34bd820b9 100644
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -2460,7 +2460,6 @@ STR_NETWORK_CONNECTING_SPECIAL_2                                :{BLACK}Fetching
 STR_NETWORK_CONNECTION_DISCONNECT                               :{BLACK}Disconnect
 
 STR_NETWORK_NEED_GAME_PASSWORD_CAPTION                          :{WHITE}Server is protected. Enter password
-STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION                       :{WHITE}Company is protected. Enter password
 
 # Network company list added strings
 STR_NETWORK_COMPANY_LIST_CLIENT_LIST                            :Online players
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index 307f38814f..2aca0fc6ca 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -709,7 +709,7 @@ class ClientGamePasswordRequestHandler : public NetworkAuthenticationPasswordReq
 		if (!_network_join.server_password.empty()) {
 			request->Reply(_network_join.server_password);
 		} else {
-			ShowNetworkNeedPassword(NETWORK_GAME_PASSWORD, request);
+			ShowNetworkNeedPassword(request);
 		}
 	}
 };
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index bc2530fe87..323188faea 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -2208,19 +2208,13 @@ void ShowJoinStatusWindow()
 	new NetworkJoinStatusWindow(&_network_join_status_window_desc);
 }
 
-void ShowNetworkNeedPassword(NetworkPasswordType npt, std::shared_ptr<NetworkAuthenticationPasswordRequest> request)
+void ShowNetworkNeedPassword(std::shared_ptr<NetworkAuthenticationPasswordRequest> request)
 {
 	NetworkJoinStatusWindow *w = dynamic_cast<NetworkJoinStatusWindow *>(FindWindowById(WC_NETWORK_STATUS_WINDOW, WN_NETWORK_STATUS_WINDOW_JOIN));
 	if (w == nullptr) return;
 	w->request = request;
 
-	StringID caption;
-	switch (npt) {
-		default: NOT_REACHED();
-		case NETWORK_GAME_PASSWORD:    caption = STR_NETWORK_NEED_GAME_PASSWORD_CAPTION; break;
-		case NETWORK_COMPANY_PASSWORD: caption = STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION; break;
-	}
-	ShowQueryString(STR_EMPTY, caption, NETWORK_PASSWORD_LENGTH, w, CS_ALPHANUMERAL, QSF_PASSWORD);
+	ShowQueryString(STR_EMPTY, STR_NETWORK_NEED_GAME_PASSWORD_CAPTION, NETWORK_PASSWORD_LENGTH, w, CS_ALPHANUMERAL, QSF_NONE);
 }
 
 /**
diff --git a/src/network/network_gui.h b/src/network/network_gui.h
index 222542e210..6c2555a5bf 100644
--- a/src/network/network_gui.h
+++ b/src/network/network_gui.h
@@ -17,7 +17,7 @@
 #include "network_type.h"
 #include "network_gamelist.h"
 
-void ShowNetworkNeedPassword(NetworkPasswordType npt, std::shared_ptr<class NetworkAuthenticationPasswordRequest> request);
+void ShowNetworkNeedPassword(std::shared_ptr<class NetworkAuthenticationPasswordRequest> request);
 void ShowNetworkChatQueryWindow(DestType type, int dest);
 void ShowJoinStatusWindow();
 void ShowNetworkGameWindow();
diff --git a/src/network/network_type.h b/src/network/network_type.h
index 0ab7d51558..911a163de0 100644
--- a/src/network/network_type.h
+++ b/src/network/network_type.h
@@ -72,12 +72,6 @@ struct NetworkCompanyStats {
 
 struct NetworkClientInfo;
 
-/** The type of password we're asking for. */
-enum NetworkPasswordType {
-	NETWORK_GAME_PASSWORD,    ///< The password of the game.
-	NETWORK_COMPANY_PASSWORD, ///< The password of the company.
-};
-
 /**
  * Destination of our chat messages.
  * @warning The values of the enum items are part of the admin network API. Only append at the end.