X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=914f4971b2fdf9686d572d0aafb31bb1ebc2deaf;hb=df11f4a529251a285f3a33946da81623044fef3f;hp=88c5552175bbea0acb9b8f878ca82add913892b8;hpb=4cc378525f493292a995869afcf0c45f1f38f951;p=rocksndiamonds.git diff --git a/src/network.c b/src/network.c index 88c55521..914f4971 100644 --- a/src/network.c +++ b/src/network.c @@ -1,17 +1,19 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2002 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* network.c * +* network.c * ***********************************************************/ -#if !defined(MSDOS) && !defined(WIN32) +#include "libgame/platform.h" + +#if defined(PLATFORM_UNIX) #include #include @@ -22,15 +24,15 @@ #include #include +#include "libgame/libgame.h" + #include "network.h" #include "netserv.h" #include "game.h" #include "tape.h" #include "files.h" #include "tools.h" -#include "buttons.h" #include "screens.h" -#include "misc.h" struct NetworkClientPlayerInfo { @@ -98,7 +100,7 @@ char *getNetworkPlayerName(int player_nr) else if (player_nr == first_player.nr) return("you"); else - for (player=&first_player; player; player=player->next) + for (player = &first_player; player; player = player->next) if (player->nr == player_nr && player->name && strlen(player->name)) return(player->name); @@ -171,7 +173,7 @@ boolean ConnectToServer(char *hostname, int port) StartNetworkServer(port); /* wait for server to start up and try connecting several times */ - for (i=0; i<6; i++) + for (i = 0; i < 6; i++) { Delay(500); /* wait 500 ms == 0.5 seconds */ close(sfd); @@ -236,9 +238,9 @@ void SendToServer_StartPlaying() buffer[8] = (unsigned char)((new_random_seed >> 8) & 0xff); buffer[9] = (unsigned char)((new_random_seed >> 0) & 0xff); - strcpy((char *)&buffer[10], leveldir_current->filename); + strcpy((char *)&buffer[10], leveldir_current->identifier); - SendBufferToServer(10 + strlen(leveldir_current->filename) + 1); + SendBufferToServer(10 + strlen(leveldir_current->identifier) + 1); } void SendToServer_PausePlaying() @@ -264,7 +266,7 @@ void SendToServer_StopPlaying() void SendToServer_MovePlayer(byte player_action) { - buffer[1] = OP_MOVE_FIGURE; + buffer[1] = OP_MOVE_PLAYER; buffer[2] = player_action; SendBufferToServer(3); @@ -298,7 +300,7 @@ static void Handle_OP_YOUR_NUMBER() } if (first_player.nr > MAX_PLAYERS) - Error(ERR_EXIT, "sorry - no more than %d players", MAX_PLAYERS); + Error(ERR_EXIT, "sorry, more than %d players not allowed", MAX_PLAYERS); Error(ERR_NETWORK_CLIENT, "you get client # %d", new_client_nr); } @@ -376,7 +378,7 @@ static void Handle_OP_PLAYER_CONNECTED() printf("OP_PLAYER_CONNECTED: %d\n", new_client_nr); Error(ERR_NETWORK_CLIENT, "new client %d connected", new_client_nr); - for (player=&first_player; player; player=player->next) + for (player = &first_player; player; player = player->next) { if (player->nr == new_client_nr) Error(ERR_EXIT, "multiplayer server sent duplicate player id"); @@ -403,7 +405,7 @@ static void Handle_OP_PLAYER_DISCONNECTED() Error(ERR_NETWORK_CLIENT, "client %d (%s) disconnected", player_nr, getNetworkPlayerName(buffer[0])); - for (player=&first_player; player; player=player->next) + for (player = &first_player; player; player = player->next) if (player->next == player_disconnected) player->next = player_disconnected->next; free(player_disconnected); @@ -411,31 +413,32 @@ static void Handle_OP_PLAYER_DISCONNECTED() static void Handle_OP_START_PLAYING() { - struct LevelDirInfo *new_leveldir; + LevelDirTree *new_leveldir; int new_level_nr; int dummy; /* !!! HAS NO MEANING ANYMORE !!! */ unsigned long new_random_seed; - char *new_leveldir_filename; + char *new_leveldir_identifier; new_level_nr = (buffer[2] << 8) + buffer[3]; dummy = (buffer[4] << 8) + buffer[5]; new_random_seed = (buffer[6] << 24) | (buffer[7] << 16) | (buffer[8] << 8) | (buffer[9]); - new_leveldir_filename = (char *)&buffer[10]; + new_leveldir_identifier = (char *)&buffer[10]; - new_leveldir = getLevelDirInfoFromFilename(new_leveldir_filename); + new_leveldir = getTreeInfoFromIdentifier(leveldir_first, + new_leveldir_identifier); if (new_leveldir == NULL) { - Error(ERR_WARN, "no such level directory: '%s'", new_leveldir_filename); + Error(ERR_WARN, "no such level identifier: '%s'", new_leveldir_identifier); new_leveldir = leveldir_first; - Error(ERR_WARN, "using default level directory: '%s'", new_leveldir->name); + Error(ERR_WARN, "using default level set: '%s'", new_leveldir->identifier); } printf("OP_START_PLAYING: %d\n", buffer[0]); Error(ERR_NETWORK_CLIENT, - "client %d starts game [level %d from leveldir '%s']\n", - buffer[0], new_level_nr, new_leveldir->name); + "client %d starts game [level %d from level identifier '%s']\n", + buffer[0], new_level_nr, new_leveldir->identifier); leveldir_current = new_leveldir; level_nr = new_level_nr; @@ -452,7 +455,7 @@ static void Handle_OP_START_PLAYING() InitRND(new_random_seed); - game_status = PLAYING; + game_status = GAME_MODE_PLAYING; InitGame(); } @@ -479,11 +482,11 @@ static void Handle_OP_STOP_PLAYING() printf("OP_STOP_PLAYING: %d\n", buffer[0]); Error(ERR_NETWORK_CLIENT, "client %d stops game", buffer[0]); - game_status = MAINMENU; + game_status = GAME_MODE_MAIN; DrawMainMenu(); } -static void Handle_OP_MOVE_FIGURE(unsigned int len) +static void Handle_OP_MOVE_PLAYER(unsigned int len) { int server_frame_counter; int i; @@ -503,7 +506,7 @@ static void Handle_OP_MOVE_FIGURE(unsigned int len) } /* copy valid player actions */ - for (i=0; i