X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fnetwork.c;h=104b83f9bb2df69b3e36c2f83107fe37d0bd6772;hb=cdc3c940197937b0508a1eb7dcf44874951908b7;hp=88c5552175bbea0acb9b8f878ca82add913892b8;hpb=4cc378525f493292a995869afcf0c45f1f38f951;p=rocksndiamonds.git diff --git a/src/network.c b/src/network.c index 88c55521..104b83f9 100644 --- a/src/network.c +++ b/src/network.c @@ -1,26 +1,35 @@ /*********************************************************** -* 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(NETWORK_AVALIABLE) #include #include + +#if defined(TARGET_SDL) +#include "main.h" +#else #include #include #include #include #include #include +#endif + +#include "libgame/libgame.h" #include "network.h" #include "netserv.h" @@ -28,9 +37,7 @@ #include "tape.h" #include "files.h" #include "tools.h" -#include "buttons.h" #include "screens.h" -#include "misc.h" struct NetworkClientPlayerInfo { @@ -48,7 +55,13 @@ static struct NetworkClientPlayerInfo first_player = /* server stuff */ -static int sfd; +#if defined(TARGET_SDL) +static TCPsocket sfd; /* server socket */ +static SDLNet_SocketSet rfds; /* socket set */ +#else +static int sfd; /* server socket */ +#endif + static byte realbuffer[512]; static byte readbuffer[MAX_BUFFER_SIZE], writbuffer[MAX_BUFFER_SIZE]; static byte *buffer = realbuffer + 4; @@ -70,7 +83,11 @@ static void SendBufferToServer(int size) nwrite += 4 + size; /* directly send the buffer to the network server */ +#if defined(TARGET_SDL) + SDLNet_TCP_Send(sfd, writbuffer, nwrite); +#else write(sfd, writbuffer, nwrite); +#endif nwrite = 0; } @@ -98,7 +115,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); @@ -107,6 +124,15 @@ char *getNetworkPlayerName(int player_nr) static void StartNetworkServer(int port) { +#if defined(TARGET_SDL) + static int p; + + p = port; + server_thread = SDL_CreateThread(NetworkServerThread, &p); + network_server = TRUE; + +#else + switch (fork()) { case 0: @@ -125,8 +151,68 @@ static void StartNetworkServer(int port) /* we are parent process -- resume normal operation */ return; } +#endif +} + +#if defined(TARGET_SDL) +boolean ConnectToServer(char *hostname, int port) +{ + IPaddress ip; + int i; + + if (port == 0) + port = DEFAULT_SERVER_PORT; + + rfds = SDLNet_AllocSocketSet(1); + + if (hostname) + { + SDLNet_ResolveHost(&ip, hostname, port); + if (ip.host == INADDR_NONE) + Error(ERR_EXIT, "cannot locate host '%s'", hostname); + } + else + { + SDLNet_Write32(0x7f000001, &ip.host); /* 127.0.0.1 */ + SDLNet_Write16(port, &ip.port); + } + + sfd = SDLNet_TCP_Open(&ip); + + if (sfd) + { + SDLNet_TCP_AddSocket(rfds, sfd); + return TRUE; + } + else + { + printf("SDLNet_TCP_Open(): %s\n", SDLNet_GetError()); + } + + if (hostname) /* connect to specified server failed */ + return FALSE; + + printf("No rocksndiamonds server on localhost -- starting up one ...\n"); + StartNetworkServer(port); + + /* wait for server to start up and try connecting several times */ + for (i = 0; i < 6; i++) + { + Delay(500); /* wait 500 ms == 0.5 seconds */ + + if ((sfd = SDLNet_TCP_Open(&ip))) /* connected */ + { + SDLNet_TCP_AddSocket(rfds, sfd); + return TRUE; + } + } + + /* when reaching this point, connect to newly started server has failed */ + return FALSE; } +#else + boolean ConnectToServer(char *hostname, int port) { struct sockaddr_in s; @@ -167,11 +253,11 @@ boolean ConnectToServer(char *hostname, int port) if (hostname) /* connect to specified server failed */ return FALSE; - printf("No rocksndiamonds server on localhost - starting up one ...\n"); + printf("No rocksndiamonds server on localhost -- starting up one ...\n"); 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); @@ -189,6 +275,7 @@ boolean ConnectToServer(char *hostname, int port) /* when reaching this point, connect to newly started server has failed */ return FALSE; } +#endif /* defined(TARGET_SDL) */ void SendToServer_PlayerName(char *player_name) { @@ -236,9 +323,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 +351,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 +385,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 +463,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 +490,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 +498,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 !!! */ + int dummy; 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]; + dummy = (buffer[4] << 8) + buffer[5]; /* (obsolete) */ 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; @@ -444,6 +532,9 @@ static void Handle_OP_START_PLAYING() LoadTape(level_nr); LoadLevel(level_nr); +#if 1 + StartGameActions(FALSE, setup.autorecord, new_random_seed); +#else if (setup.autorecord) TapeStartRecording(); @@ -452,8 +543,9 @@ static void Handle_OP_START_PLAYING() InitRND(new_random_seed); - game_status = PLAYING; + game_status = GAME_MODE_PLAYING; InitGame(); +#endif } static void Handle_OP_PAUSE_PLAYING() @@ -479,11 +571,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 +595,7 @@ static void Handle_OP_MOVE_FIGURE(unsigned int len) } /* copy valid player actions */ - for (i=0; i 0) +#else + if (FD_ISSET(sfd, &rfds)) +#endif + { +#if defined(TARGET_SDL) + r = SDLNet_TCP_Recv(sfd, readbuffer + nread, 1); +#else + r = read(sfd, readbuffer + nread, MAX_BUFFER_SIZE - nread); +#endif + + if (r < 0) + Error(ERR_EXIT, "error reading from network server"); - if (r == 0) - Error(ERR_EXIT, "connection to network server lost"); + if (r == 0) + Error(ERR_EXIT, "connection to network server lost"); - nread += r; + nread += r; - HandleNetworkingMessages(); + HandleNetworkingMessages(); + } } + while (r > 0); } -#endif /* !MSDOS && !WIN32 */ +#endif /* PLATFORM_UNIX */