X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=655f9c8f3f8a2ce809bce1f9dfe786ff75c7e46b;hb=5abed77f4575375756d228a2afc749589a25c87a;hp=9c149138113f6bf8bc41b29d73c504458a41bf77;hpb=80aa0e4b2b060112407417a9d2896395023a21cc;p=rocksndiamonds.git diff --git a/src/network.c b/src/network.c index 9c149138..655f9c8f 100644 --- a/src/network.c +++ b/src/network.c @@ -87,7 +87,8 @@ static void SendBufferToServer(int size) #if defined(TARGET_SDL) SDLNet_TCP_Send(sfd, writbuffer, nwrite); #else - write(sfd, writbuffer, nwrite); + if (write(sfd, writbuffer, nwrite) == -1) + Error(ERR_WARN, "write() failed; %s", strerror(errno)); #endif nwrite = 0; } @@ -129,7 +130,12 @@ static void StartNetworkServer(int port) static int p; p = port; +#if defined(TARGET_SDL2) + server_thread = SDL_CreateThread(NetworkServerThread, + "NetworkServerThread", &p); +#else server_thread = SDL_CreateThread(NetworkServerThread, &p); +#endif network_server = TRUE; #else @@ -433,7 +439,7 @@ static void Handle_OP_NUMBER_WANTED() { char request[100]; - sprintf(request, "Sorry ! Player %d already exists ! You are player %d !", + sprintf(request, "Sorry! Player %d already exists! You are player %d!", index_nr_wanted + 1, new_index_nr + 1); Request(request, REQ_CONFIRM); @@ -565,7 +571,7 @@ static void Handle_OP_STOP_PLAYING() else if (buffer[2] == NETWORK_STOP_BY_ERROR) Request("Network game stopped due to internal error!", REQ_CONFIRM); else - Request("Network game stopped !", REQ_CONFIRM); + Request("Network game stopped!", REQ_CONFIRM); } game_status = GAME_MODE_MAIN;