static void sysmsg(char *s)
{
- if (verbose)
+ if (options.verbose)
{
printf("** %s\n", s);
fflush(stdout);
static void sendbuf(int len)
{
- if (network)
+ if (options.network)
{
realbuf[0] = realbuf[1] = realbuf[2] = 0;
realbuf[3] = (unsigned char)len;
switch (fork())
{
case 0:
- NetworkServer(port, serveronly);
+ NetworkServer(port, options.serveronly);
/* never reached */
exit(0);
case -1:
- Error(ERR_RETURN,
+ Error(ERR_WARN,
"cannot create network server process - no network games");
- network = FALSE;
+ options.network = FALSE;
return;
default:
}
}
-BOOL ConnectToServer(char *host, int port)
+boolean ConnectToServer(char *host, int port)
{
struct hostent *hp;
struct sockaddr_in s;
void SendToServer_Nickname(char *nickname)
{
static char msgbuf[300];
+ int len_nickname = strlen(nickname);
buf[1] = OP_NICKNAME;
- memcpy(&buf[2], nickname, strlen(nickname));
- sendbuf(2 + strlen(nickname));
+ memcpy(&buf[2], nickname, len_nickname);
+ sendbuf(2 + len_nickname);
sprintf(msgbuf, "you set your nick to \"%s\"", nickname);
sysmsg(msgbuf);
}
static void Handle_OP_BAD_PROTOCOL_VERSION()
{
- Error(ERR_RETURN, "protocol version mismatch");
+ Error(ERR_WARN, "protocol version mismatch");
Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d",
buf[2], buf[3], PROT_VERS_1, PROT_VERS_2, PROT_VERS_3);
}
*new_local_player = *old_local_player;
old_local_player->connected = FALSE;
- old_local_player->local = FALSE;
local_player = new_local_player;
}
*new_player = *old_player;
old_player->connected = FALSE;
- old_player->local = FALSE;
}
u = finduser(old_client_nr);
if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0)
- Error(ERR_RETURN, "no such level directory: '%s'",new_leveldir_name);
+ Error(ERR_WARN, "no such level directory: '%s'",new_leveldir_name);
leveldir_nr = new_leveldir_nr;
+ /*
local_player->leveldir_nr = leveldir_nr;
+ */
+
+
+ /*
+ SaveLevelSetup();
+ */
+
+ /*
LoadPlayerInfo(PLAYER_LEVEL);
SavePlayerInfo(PLAYER_SETUP);
+ */
+
level_nr = new_level_nr;
TapeErase();
- LoadLevelTape(level_nr);
+ LoadTape(level_nr);
+ /*
GetPlayerConfig();
+ */
+
LoadLevel(level_nr);
- if (autorecord_on)
+ if (setup.autorecord)
TapeStartRecording();
/* copy valid player actions */
for (i=0; i<MAX_PLAYERS; i++)
- network_player_action[i] =
+ stored_player[i].effective_action =
(i < len - 6 && stored_player[i].active ? buf[6 + i] : 0);
network_player_action_received = TRUE;