fixed some bugs and added some speed when scaling in-game tile size

[rocksndiamonds.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 1a0feda699008b9eaf90d9b937f7ed447e8f2f49..655f9c8f3f8a2ce809bce1f9dfe786ff75c7e46b 100644 (file)
--- 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
@@ -308,7 +314,7 @@ void SendToServer_NrWanted(int nr_wanted)
 
 void SendToServer_StartPlaying()
 {
-  unsigned long new_random_seed = InitRND(NEW_RANDOMIZE);
+  unsigned int new_random_seed = InitRND(level.random_seed);
 
   int dummy = 0;               /* !!! HAS NO MEANING ANYMORE !!! */
                                /* the name of the level must be enough */
@@ -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);
@@ -502,12 +508,10 @@ static void Handle_OP_START_PLAYING()
 {
   LevelDirTree *new_leveldir;
   int new_level_nr;
-  int dummy;
-  unsigned long new_random_seed;
+  unsigned int new_random_seed;
   char *new_leveldir_identifier;
 
   new_level_nr = (buffer[2] << 8) + buffer[3];
-  dummy = (buffer[4] << 8) + buffer[5];                        /* (obsolete) */
   new_random_seed =
     (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]);
   new_leveldir_identifier = (char *)&buffer[10];
@@ -567,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;