cpp/openttd-patchpack/source Changeset - r25350:f2f32536f95c

Changeset - r25350:f2f32536f95c

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium42 - 3 years ago 2021-04-30 13:39:46
rubidium@openttd.org

Codechange: rename NetworkError to ShowNetworkError

4 files changed with 5 insertions and 5 deletions:

src/network/core/tcp_listen.h

src/network/network.cpp

src/network/network_client.cpp

src/network/network_internal.h

0 comments (0 inline, 0 general)

src/network/core/tcp_listen.h

➞

Show inline comments

@@ @@ -151,7 +151,7 @@ public: @@
 		if (sockets.size() == 0) {
 			DEBUG(net, 0, "[server] could not start network: could not create listening socket");
-			NetworkError(STR_NETWORK_ERROR_SERVER_START);
+			ShowNetworkError(STR_NETWORK_ERROR_SERVER_START);
 			return false;
+		}

src/network/network.cpp

➞

Show inline comments

@@ @@ -277,7 +277,7 @@ uint NetworkCalculateLag(const NetworkCl @@
 /* There was a non-recoverable error, drop back to the main menu with a nice
  *  error */
-void NetworkError(StringID error_string)
+void ShowNetworkError(StringID error_string)
+{
 	_switch_mode = SM_MENU;
 	ShowErrorMessage(error_string, INVALID_STRING_ID, WL_CRITICAL);
@@ @@ -701,7 +701,7 @@ public: @@
 	void OnFailure() override
+	{
-		NetworkError(STR_NETWORK_ERROR_NOCONNECTION);
+		ShowNetworkError(STR_NETWORK_ERROR_NOCONNECTION);
+	}
 	void OnConnect(SOCKET s) override

src/network/network_client.cpp

➞

Show inline comments

@@ @@ -284,7 +284,7 @@ void ClientNetworkGameSocketHandler::Cli @@
 #else
 			if (_sync_seed_1 != _random.state[0]) {
 #endif
-				NetworkError(STR_NETWORK_ERROR_DESYNC);
+				ShowNetworkError(STR_NETWORK_ERROR_DESYNC);
 				DEBUG(desync, 1, "sync_err: %08x; %02x", _date, _date_fract);
 				DEBUG(net, 0, "Sync error detected!");
 				my_client->ClientError(NETWORK_RECV_STATUS_DESYNC);

src/network/network_internal.h

➞

Show inline comments

@@ @@ -112,7 +112,7 @@ void NetworkExecuteLocalCommandQueue(); @@
 void NetworkFreeLocalCommandQueue();
 void NetworkSyncCommandQueue(NetworkClientSocket *cs);
-void NetworkError(StringID error_string);
+void ShowNetworkError(StringID error_string);
 void NetworkTextMessage(NetworkAction action, TextColour colour, bool self_send, const char *name, const char *str = "", int64 data = 0);
 uint NetworkCalculateLag(const NetworkClientSocket *cs);
 StringID GetNetworkErrorMsg(NetworkErrorCode err);

0 comments (0 inline, 0 general)