projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20031205-B-src
[rocksndiamonds.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index 946a94d84315509460ea5b30ac247e193cbaca99..73a13b1f8ab3032962e7b46a57fa048452fce944 100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-1,7
+1,7
@@
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
/***********************************************************
* Rocks'n'Diamonds -- McDuffin Strikes Back! *
*----------------------------------------------------------*
-* (c) 1995-200
1
Artsoft Entertainment *
+* (c) 1995-200
2
Artsoft Entertainment *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
* Holger Schemel *
* Detmolder Strasse 189 *
* 33604 Bielefeld *
@@
-11,7
+11,7
@@
* network.c *
***********************************************************/
* network.c *
***********************************************************/
-#include "libgame/
libgame
.h"
+#include "libgame/
platform
.h"
#if defined(PLATFORM_UNIX)
#if defined(PLATFORM_UNIX)
@@
-24,9
+24,7
@@
#include <arpa/inet.h>
#include <netdb.h>
#include <arpa/inet.h>
#include <netdb.h>
-#if 0
#include "libgame/libgame.h"
#include "libgame/libgame.h"
-#endif
#include "network.h"
#include "netserv.h"
#include "network.h"
#include "netserv.h"
@@
-102,7
+100,7
@@
char *getNetworkPlayerName(int player_nr)
else if (player_nr == first_player.nr)
return("you");
else
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);
if (player->nr == player_nr && player->name && strlen(player->name))
return(player->name);
@@
-175,7
+173,7
@@
boolean ConnectToServer(char *hostname, int port)
StartNetworkServer(port);
/* wait for server to start up and try connecting several times */
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);
{
Delay(500); /* wait 500 ms == 0.5 seconds */
close(sfd);
@@
-240,9
+238,9
@@
void SendToServer_StartPlaying()
buffer[8] = (unsigned char)((new_random_seed >> 8) & 0xff);
buffer[9] = (unsigned char)((new_random_seed >> 0) & 0xff);
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()
}
void SendToServer_PausePlaying()
@@
-268,7
+266,7
@@
void SendToServer_StopPlaying()
void SendToServer_MovePlayer(byte player_action)
{
void SendToServer_MovePlayer(byte player_action)
{
- buffer[1] = OP_MOVE_
FIGURE
;
+ buffer[1] = OP_MOVE_
PLAYER
;
buffer[2] = player_action;
SendBufferToServer(3);
buffer[2] = player_action;
SendBufferToServer(3);
@@
-380,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);
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");
{
if (player->nr == new_client_nr)
Error(ERR_EXIT, "multiplayer server sent duplicate player id");
@@
-407,7
+405,7
@@
static void Handle_OP_PLAYER_DISCONNECTED()
Error(ERR_NETWORK_CLIENT, "client %d (%s) disconnected",
player_nr, getNetworkPlayerName(buffer[0]));
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);
if (player->next == player_disconnected)
player->next = player_disconnected->next;
free(player_disconnected);
@@
-419,27
+417,28
@@
static void Handle_OP_START_PLAYING()
int new_level_nr;
int dummy; /* !!! HAS NO MEANING ANYMORE !!! */
unsigned long new_random_seed;
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_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 = getTreeInfoFromFilename(new_leveldir_filename);
+ new_leveldir = getTreeInfoFromIdentifier(leveldir_first,
+ new_leveldir_identifier);
if (new_leveldir == NULL)
{
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;
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,
}
printf("OP_START_PLAYING: %d\n", buffer[0]);
Error(ERR_NETWORK_CLIENT,
- "client %d starts game [level %d from level
di
r '%s']\n",
- buffer[0], new_level_nr, new_leveldir->
name
);
+ "client %d starts game [level %d from level
identifie
r '%s']\n",
+ buffer[0], new_level_nr, new_leveldir->
identifier
);
leveldir_current = new_leveldir;
level_nr = new_level_nr;
leveldir_current = new_leveldir;
level_nr = new_level_nr;
@@
-456,7
+455,7
@@
static void Handle_OP_START_PLAYING()
InitRND(new_random_seed);
InitRND(new_random_seed);
- game_status = PLAYING;
+ game_status =
GAME_MODE_
PLAYING;
InitGame();
}
InitGame();
}
@@
-483,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]);
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();
}
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;
{
int server_frame_counter;
int i;
@@
-507,7
+506,7
@@
static void Handle_OP_MOVE_FIGURE(unsigned int len)
}
/* copy valid player actions */
}
/* copy valid player actions */
- for (i
=0; i<
MAX_PLAYERS; i++)
+ for (i
= 0; i <
MAX_PLAYERS; i++)
stored_player[i].effective_action =
(i < len - 6 && stored_player[i].active ? buffer[6 + i] : 0);
stored_player[i].effective_action =
(i < len - 6 && stored_player[i].active ? buffer[6 + i] : 0);
@@
-570,8
+569,8
@@
static void HandleNetworkingMessages()
Handle_OP_STOP_PLAYING();
break;
Handle_OP_STOP_PLAYING();
break;
- case OP_MOVE_
FIGURE
:
- Handle_OP_MOVE_
FIGURE
(message_length);
+ case OP_MOVE_
PLAYER
:
+ Handle_OP_MOVE_
PLAYER
(message_length);
break;
case OP_BROADCAST_MESSAGE:
break;
case OP_BROADCAST_MESSAGE: