added waiting for key or button after starting or stopping network mode
[rocksndiamonds.git] / src / network.c
index 728517465eb8d5123dc5652f5ab9cbcf716a4a2b..e1bce45a459a58196f664774523e22f657e2fc69 100644 (file)
@@ -22,6 +22,7 @@
 #include "files.h"
 #include "tools.h"
 #include "screens.h"
+#include "init.h"
 
 struct NetworkClientPlayerInfo
 {
@@ -50,6 +51,8 @@ static boolean stop_network_game = FALSE;
 static boolean stop_network_client = FALSE;
 static char stop_network_client_message[MAX_OUTPUT_LINESIZE + 1];
 
+static struct NetworkLevelInfo network_level;
+
 static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize)
 {
   static int xpos = 0, ypos = 0;
@@ -139,7 +142,7 @@ static void SendNetworkBufferToServer(struct NetworkBuffer *nb)
   SDLNet_TCP_Send(sfd, nb->buffer, nb->size);
 }
 
-struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr)
+static struct NetworkClientPlayerInfo *getNetworkPlayer(int player_nr)
 {
   struct NetworkClientPlayerInfo *player = NULL;
 
@@ -170,6 +173,11 @@ char *getNetworkPlayerName(int player_nr)
   return(EMPTY_PLAYER_NAME);
 }
 
+static boolean hasPathSeparator(char *s)
+{
+  return (strchr(s, '/') != NULL);
+}
+
 static void StartNetworkServer(int port)
 {
   static int p;
@@ -276,7 +284,16 @@ boolean ConnectToServer(char *hostname, int port)
     SDLNet_ResolveHost(&ip, hostname, port);
 
     if (ip.host == INADDR_NONE)
-      Error(ERR_EXIT, "cannot locate host '%s'", hostname);
+    {
+      char message[100];
+
+      sprintf(message, "Failed to resolve network server hostname '%s'!",
+             hostname);
+
+      DrawNetworkText_Failed(message);
+
+      return FALSE;
+    }
     else
       server_host = SDLNet_Read32(&ip.host);
 
@@ -356,7 +373,7 @@ void SendToServer_PlayerName(char *player_name)
   Error(ERR_NETWORK_CLIENT, "you set your player name to \"%s\"", player_name);
 }
 
-void SendToServer_ProtocolVersion()
+void SendToServer_ProtocolVersion(void)
 {
   initNetworkBufferForWriting(write_buffer, OP_PROTOCOL_VERSION, 0);
 
@@ -376,7 +393,45 @@ void SendToServer_NrWanted(int nr_wanted)
   SendNetworkBufferToServer(write_buffer);
 }
 
-void SendToServer_StartPlaying()
+void SendToServer_LevelFile(void)
+{
+  initNetworkBufferForWriting(write_buffer, OP_LEVEL_FILE, 0);
+
+  putNetworkBufferString(      write_buffer, leveldir_current->identifier);
+  putNetworkBuffer16BitInteger(write_buffer, level.file_info.nr);
+  putNetworkBuffer8BitInteger( write_buffer, level.file_info.type);
+  putNetworkBuffer8BitInteger( write_buffer, level.file_info.packed);
+  putNetworkBufferString(      write_buffer, level.file_info.basename);
+  putNetworkBufferFile(        write_buffer, level.file_info.filename);
+  putNetworkBuffer8BitInteger( write_buffer, level.use_custom_template);
+
+  if (level.use_custom_template)
+  {
+    putNetworkBufferString(write_buffer, level_template.file_info.basename);
+    putNetworkBufferFile(  write_buffer, level_template.file_info.filename);
+  }
+
+  SendNetworkBufferToServer(write_buffer);
+
+  setString(&network_level.leveldir_identifier, leveldir_current->identifier);
+
+  /* the sending client does not use network level files (but the real ones) */
+  network_level.use_network_level_files = FALSE;
+
+#if 0
+  printf("::: '%s'\n", leveldir_current->identifier);
+  printf("::: '%d'\n", level.file_info.nr);
+  printf("::: '%d'\n", level.file_info.type);
+  printf("::: '%d'\n", level.file_info.packed);
+  printf("::: '%s'\n", level.file_info.basename);
+  printf("::: '%s'\n", level.file_info.filename);
+
+  if (level.use_custom_template)
+    printf("::: '%s'\n", level_template.file_info.filename);
+#endif
+}
+
+void SendToServer_StartPlaying(void)
 {
   unsigned int new_random_seed = InitRND(level.random_seed);
 
@@ -389,14 +444,14 @@ void SendToServer_StartPlaying()
   SendNetworkBufferToServer(write_buffer);
 }
 
-void SendToServer_PausePlaying()
+void SendToServer_PausePlaying(void)
 {
   initNetworkBufferForWriting(write_buffer, OP_PAUSE_PLAYING, 0);
 
   SendNetworkBufferToServer(write_buffer);
 }
 
-void SendToServer_ContinuePlaying()
+void SendToServer_ContinuePlaying(void)
 {
   initNetworkBufferForWriting(write_buffer, OP_CONTINUE_PLAYING, 0);
 
@@ -421,7 +476,7 @@ void SendToServer_MovePlayer(byte player_action)
   SendNetworkBufferToServer(write_buffer);
 }
 
-static void Handle_OP_BAD_PROTOCOL_VERSION()
+static void Handle_OP_BAD_PROTOCOL_VERSION(void)
 {
   int protocol_version_major = getNetworkBuffer8BitInteger(read_buffer);
   int protocol_version_minor = getNetworkBuffer8BitInteger(read_buffer);
@@ -444,7 +499,7 @@ static void Handle_OP_BAD_PROTOCOL_VERSION()
   stop_network_client = TRUE;
 }
 
-static void Handle_OP_YOUR_NUMBER()
+static void Handle_OP_YOUR_NUMBER(void)
 {
   int old_client_nr = getNetworkBuffer8BitInteger(read_buffer);
   int new_client_nr = getNetworkBuffer8BitInteger(read_buffer);
@@ -476,7 +531,7 @@ static void Handle_OP_YOUR_NUMBER()
   stored_player[new_index_nr].connected_network = TRUE;
 }
 
-static void Handle_OP_NUMBER_WANTED()
+static void Handle_OP_NUMBER_WANTED(void)
 {
   int old_client_nr    = getNetworkBuffer8BitInteger(read_buffer);
   int client_nr_wanted = getNetworkBuffer8BitInteger(read_buffer);
@@ -535,7 +590,7 @@ static void Handle_OP_NUMBER_WANTED()
     DrawNetworkPlayers();
 }
 
-static void Handle_OP_PLAYER_NAME()
+static void Handle_OP_PLAYER_NAME(void)
 {
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
   char *player_name = getNetworkBufferString(read_buffer);
@@ -550,7 +605,7 @@ static void Handle_OP_PLAYER_NAME()
        player_nr, player->name);
 }
 
-static void Handle_OP_PLAYER_CONNECTED()
+static void Handle_OP_PLAYER_CONNECTED(void)
 {
   struct NetworkClientPlayerInfo *player, *last_player = NULL;
   int new_client_nr = getNetworkBuffer8BitInteger(read_buffer);
@@ -576,7 +631,7 @@ static void Handle_OP_PLAYER_CONNECTED()
   stored_player[new_index_nr].connected_network = TRUE;
 }
 
-static void Handle_OP_PLAYER_DISCONNECTED()
+static void Handle_OP_PLAYER_DISCONNECTED(void)
 {
   struct NetworkClientPlayerInfo *player, *player_disconnected;
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
@@ -614,17 +669,14 @@ static void Handle_OP_PLAYER_DISCONNECTED()
   }
 }
 
-static void Handle_OP_START_PLAYING()
+static void Handle_OP_START_PLAYING(void)
 {
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
   char *new_leveldir_identifier = getNetworkBufferString(read_buffer);
   int new_level_nr = getNetworkBuffer16BitInteger(read_buffer);
   unsigned int new_random_seed = getNetworkBuffer32BitInteger(read_buffer);
 
-  LevelDirTree *new_leveldir =
-    getTreeInfoFromIdentifier(leveldir_first, new_leveldir_identifier);
-
-  if (new_leveldir == NULL)
+  if (!strEqual(new_leveldir_identifier, network_level.leveldir_identifier))
   {
     Error(ERR_WARN, "no such level identifier: '%s'", new_leveldir_identifier);
 
@@ -636,19 +688,31 @@ static void Handle_OP_START_PLAYING()
   printf("OP_START_PLAYING: %d\n", player_nr);
   Error(ERR_NETWORK_CLIENT,
        "client %d starts game [level %d from level identifier '%s']\n",
-       player_nr, new_level_nr, new_leveldir->identifier);
+       player_nr, new_level_nr, new_leveldir_identifier);
+
+  LevelDirTree *new_leveldir =
+    getTreeInfoFromIdentifier(leveldir_first, new_leveldir_identifier);
+
+  if (new_leveldir != NULL)
+  {
+    leveldir_current = new_leveldir;
+    level_nr = new_level_nr;
+  }
 
-  leveldir_current = new_leveldir;
-  level_nr = new_level_nr;
+  /* needed if level set of network game changed graphics, sounds or music */
+  ReloadCustomArtwork(0);
 
   TapeErase();
-  LoadTape(level_nr);
-  LoadLevel(level_nr);
+
+  if (network_level.use_network_level_files)
+    LoadNetworkLevel(&network_level);
+  else
+    LoadLevel(level_nr);
 
   StartGameActions(FALSE, setup.autorecord, new_random_seed);
 }
 
-static void Handle_OP_PAUSE_PLAYING()
+static void Handle_OP_PAUSE_PLAYING(void)
 {
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
 
@@ -662,7 +726,7 @@ static void Handle_OP_PAUSE_PLAYING()
   }
 }
 
-static void Handle_OP_CONTINUE_PLAYING()
+static void Handle_OP_CONTINUE_PLAYING(void)
 {
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
 
@@ -676,7 +740,7 @@ static void Handle_OP_CONTINUE_PLAYING()
   }
 }
 
-static void Handle_OP_STOP_PLAYING()
+static void Handle_OP_STOP_PLAYING(void)
 {
   int client_nr = getNetworkBuffer8BitInteger(read_buffer);
   int cause_for_stopping = getNetworkBuffer8BitInteger(read_buffer);
@@ -692,11 +756,12 @@ static void Handle_OP_STOP_PLAYING()
     boolean stopped_by_remote_player = (!client_player->connected_locally);
     char message[100];
 
-    sprintf(message, (cause_for_stopping == NETWORK_STOP_BY_PLAYER ?
-                     "Network game stopped by player %d!" :
-                     cause_for_stopping == NETWORK_STOP_BY_ERROR ?
-                     "Network game stopped due to internal error!" :
-                     "Network game stopped!"), client_nr);
+    if (cause_for_stopping == NETWORK_STOP_BY_PLAYER)
+      sprintf(message, "Network game stopped by player %d!", client_nr);
+    else
+      sprintf(message, (cause_for_stopping == NETWORK_STOP_BY_ERROR ?
+                       "Network game stopped due to internal error!" :
+                       "Network game stopped!"));
 
     if (cause_for_stopping != NETWORK_STOP_BY_PLAYER ||
        stopped_by_remote_player)
@@ -708,7 +773,7 @@ static void Handle_OP_STOP_PLAYING()
   }
 }
 
-static void Handle_OP_MOVE_PLAYER()
+static void Handle_OP_MOVE_PLAYER(void)
 {
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
   int server_frame_counter = getNetworkBuffer32BitInteger(read_buffer);
@@ -738,7 +803,7 @@ static void Handle_OP_MOVE_PLAYER()
   network_player_action_received = TRUE;
 }
 
-static void Handle_OP_BROADCAST_MESSAGE()
+static void Handle_OP_BROADCAST_MESSAGE(void)
 {
   int player_nr = getNetworkBuffer8BitInteger(read_buffer);
 
@@ -746,7 +811,77 @@ static void Handle_OP_BROADCAST_MESSAGE()
   Error(ERR_NETWORK_CLIENT, "client %d sends message", player_nr);
 }
 
-static void HandleNetworkingMessage()
+static void Handle_OP_LEVEL_FILE(void)
+{
+  int player_nr = getNetworkBuffer8BitInteger(read_buffer);
+  char *leveldir_identifier;
+  char *network_level_dir;
+  struct LevelFileInfo *file_info = &network_level.file_info;
+  struct LevelFileInfo *tmpl_info = &network_level.tmpl_info;
+  boolean use_custom_template;
+
+  setString(&network_level.leveldir_identifier, NULL);
+  setString(&network_level.file_info.basename,  NULL);
+  setString(&network_level.file_info.filename,  NULL);
+  setString(&network_level.tmpl_info.basename,  NULL);
+  setString(&network_level.tmpl_info.filename,  NULL);
+
+  printf("OP_LEVEL_FILE: %d\n", player_nr);
+
+  leveldir_identifier = getStringCopy(getNetworkBufferString(read_buffer));
+
+  if (hasPathSeparator(leveldir_identifier))
+    Error(ERR_EXIT, "protocol error: invalid filename from network client");
+
+  InitNetworkLevelDirectory(leveldir_identifier);
+
+  network_level_dir   = getNetworkLevelDir(leveldir_identifier);
+
+  file_info->nr       = getNetworkBuffer16BitInteger(read_buffer);
+  file_info->type     = getNetworkBuffer8BitInteger(read_buffer);
+  file_info->packed   = getNetworkBuffer8BitInteger(read_buffer);
+  file_info->basename = getStringCopy(getNetworkBufferString(read_buffer));
+  file_info->filename = getPath2(network_level_dir, file_info->basename);
+
+  if (hasPathSeparator(file_info->basename))
+    Error(ERR_EXIT, "protocol error: invalid filename from network client");
+
+  getNetworkBufferFile(read_buffer, file_info->filename);
+
+  use_custom_template = getNetworkBuffer8BitInteger(read_buffer);
+  if (use_custom_template)
+  {
+    *tmpl_info = *file_info;
+
+    tmpl_info->basename = getStringCopy(getNetworkBufferString(read_buffer));
+    tmpl_info->filename = getPath2(network_level_dir, tmpl_info->basename);
+
+    if (hasPathSeparator(tmpl_info->basename))
+      Error(ERR_EXIT, "protocol error: invalid filename from network client");
+
+    getNetworkBufferFile(read_buffer, tmpl_info->filename);
+  }
+
+  network_level.leveldir_identifier = leveldir_identifier;
+  network_level.use_custom_template = use_custom_template;
+
+  /* the receiving client(s) use(s) the transferred network level files */
+  network_level.use_network_level_files = TRUE;
+
+#if 0
+  printf("::: '%s'\n", leveldir_identifier);
+  printf("::: '%d'\n", file_info->nr);
+  printf("::: '%d'\n", file_info->type);
+  printf("::: '%d'\n", file_info->packed);
+  printf("::: '%s'\n", file_info->basename);
+  printf("::: '%s'\n", file_info->filename);
+
+  if (use_custom_template)
+    printf("::: '%s'\n", tmpl_info->filename);
+#endif
+}
+
+static void HandleNetworkingMessage(void)
 {
   stop_network_game = FALSE;
 
@@ -804,6 +939,10 @@ static void HandleNetworkingMessage()
       Handle_OP_BROADCAST_MESSAGE();
       break;
 
+    case OP_LEVEL_FILE:
+      Handle_OP_LEVEL_FILE();
+      break;
+
     default:
       if (options.verbose)
        Error(ERR_NETWORK_CLIENT,
@@ -817,7 +956,7 @@ static void HandleNetworkingMessage()
     SendToServer_StopPlaying(NETWORK_STOP_BY_ERROR);
 }
 
-static char *HandleNetworkingPackets()
+static char *HandleNetworkingPackets(void)
 {
   while (1)
   {
@@ -863,7 +1002,7 @@ static void FreeNetworkClientPlayerInfo(struct NetworkClientPlayerInfo *player)
   checked_free(player);
 }
 
-static void HandleNetworkingDisconnect()
+static void HandleNetworkingDisconnect(void)
 {
   int i;
 
@@ -886,7 +1025,7 @@ static void HandleNetworkingDisconnect()
   first_player.next = NULL;
 }
 
-void HandleNetworking()
+void HandleNetworking(void)
 {
   char *error_message = HandleNetworkingPackets();
 
@@ -912,7 +1051,7 @@ void HandleNetworking()
   }
 }
 
-void DisconnectFromNetworkServer()
+void DisconnectFromNetworkServer(void)
 {
   DrawNetworkText_Title("Terminating Network");
   DrawNetworkText("Disconnecting from network server ...");
@@ -920,7 +1059,4 @@ void DisconnectFromNetworkServer()
   HandleNetworkingDisconnect();
 
   DrawNetworkText_Success("Successfully disconnected!");
-
-  /* short time to recognize result of network initialization */
-  Delay_WithScreenUpdates(1000);
 }