updated contact info in source file headers

[rocksndiamonds.git] / src / network.c

diff --git a/src/network.c b/src/network.c
index 1733aba93441a77d164937e9bccee05a7257f0d5..8d853201f85e15cbb22028880e196d4f36bc6807 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -1,15 +1,13 @@
-/***********************************************************
-* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
-*----------------------------------------------------------*
-* (c) 1995-2002 Artsoft Entertainment                      *
-*               Holger Schemel                             *
-*               Detmolder Strasse 189                      *
-*               33604 Bielefeld                            *
-*               Germany                                    *
-*               e-mail: info@artsoft.org                   *
-*----------------------------------------------------------*
-* network.c                                                *
-***********************************************************/
+// ============================================================================
+// Rocks'n'Diamonds - McDuffin Strikes Back!
+// ----------------------------------------------------------------------------
+// (c) 1995-2014 by Artsoft Entertainment
+//                         Holger Schemel
+//                 info@artsoft.org
+//                 http://www.artsoft.org/
+// ----------------------------------------------------------------------------
+// network.c
+// ============================================================================
 
 #include "libgame/platform.h"
 
@@ -87,7 +85,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 +128,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 +312,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 */
@@ -431,18 +435,11 @@ static void Handle_OP_NUMBER_WANTED()
   }
   else if (old_client_nr == first_player.nr)   /* failed -- local player? */
   {
-#if 0
-    char *color[] = { "yellow", "red", "green", "blue" };
-#endif
     char request[100];
 
-#if 1
-    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);
-#else
-    sprintf(request, "Sorry ! %s player still exists ! You are %s player !",
-           color[index_nr_wanted], color[new_index_nr]);
-#endif
+
     Request(request, REQ_CONFIRM);
 
     Error(ERR_NETWORK_CLIENT, "cannot switch -- you keep client # %d",
@@ -509,12 +506,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];
@@ -574,7 +569,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;
@@ -599,19 +594,14 @@ static void Handle_OP_MOVE_PLAYER(unsigned int len)
 
   if (server_frame_counter != FrameCounter)
   {
-    Error(ERR_RETURN, "client and servers frame counters out of sync");
-    Error(ERR_RETURN, "frame counter of client is %d", FrameCounter);
-    Error(ERR_RETURN, "frame counter of server is %d", server_frame_counter);
-
-#if 1
-    Error(ERR_RETURN, "this should not happen -- please debug");
+    Error(ERR_INFO, "client and servers frame counters out of sync");
+    Error(ERR_INFO, "frame counter of client is %d", FrameCounter);
+    Error(ERR_INFO, "frame counter of server is %d", server_frame_counter);
+    Error(ERR_INFO, "this should not happen -- please debug");
 
     stop_network_game = TRUE;
 
     return;
-#else
-    Error(ERR_EXIT,   "this should not happen -- please debug");
-#endif
   }
 
   /* copy valid player actions */
@@ -638,7 +628,7 @@ static void HandleNetworkingMessages()
     nread -= 4 + message_length;
     memmove(readbuffer, readbuffer + 4 + message_length, nread);
 
-    switch(buffer[1])
+    switch (buffer[1])
     {
       case OP_BAD_PROTOCOL_VERSION:
        Handle_OP_BAD_PROTOCOL_VERSION();