mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: rename NetworkError to ShowNetworkError

pull/9174/head
rubidium42 2021-04-30 15:39:46 +02:00 committed by rubidium42
parent 67063ceeb3
commit 0eb17a70af
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/core/tcp_listen.h
View File

@ -151,7 +151,7 @@ public:
if (sockets.size() == 0) { if (sockets.size() == 0) {
DEBUG(net, 0, "[server] could not start network: could not create listening socket"); 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; return false;
} }

4
src/network/network.cpp
View File

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

2
src/network/network_client.cpp
View File

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

2
src/network/network_internal.h
View File

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