X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fnetwork.c;h=dcd925949a18dc1ccfc5ab5f65b53de00f8923b9;hp=d0c156198408b3af688b3f106119b9a9280af3b0;hb=d643b3820fbeb5d3c8a731dbdad2785047cb3bb2;hpb=8782186c774fb084a267151c05dc444cffab4b3d diff --git a/src/network.c b/src/network.c index d0c15619..dcd92594 100644 --- a/src/network.c +++ b/src/network.c @@ -38,15 +38,6 @@ static struct NetworkClientPlayerInfo first_player = NULL }; -struct NetworkLevelFileInfo -{ - char *leveldir_identifier; - struct LevelFileInfo file_info; - struct LevelFileInfo tmpl_info; - boolean use_network_level_files; - boolean use_custom_template; -}; - /* server stuff */ static TCPsocket sfd; /* TCP server socket */ @@ -60,7 +51,7 @@ static boolean stop_network_game = FALSE; static boolean stop_network_client = FALSE; static char stop_network_client_message[MAX_OUTPUT_LINESIZE + 1]; -static struct NetworkLevelFileInfo network_level; +static struct NetworkLevelInfo network_level; static void DrawNetworkTextExt(char *message, int font_nr, boolean initialize) { @@ -699,16 +690,13 @@ static void Handle_OP_START_PLAYING() level_nr = new_level_nr; } - SetLevelSetInfo(new_leveldir_identifier, new_level_nr); - /* needed if level set of network game changed graphics, sounds or music */ ReloadCustomArtwork(0); TapeErase(); if (network_level.use_network_level_files) - LoadLevelFromNetwork(&network_level.file_info, - &network_level.tmpl_info); + LoadNetworkLevel(&network_level); else LoadLevel(level_nr);