projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981120-2
[rocksndiamonds.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index a58c6621eb1b1a3e43975a9c1577101f9a6f5e4c..76b4e66fa9b9221876ca6eaa0c634237480159b2 100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-145,7
+145,7
@@
static void StartNetworkServer(int port)
exit(0);
case -1:
exit(0);
case -1:
- Error(ERR_
RETU
RN,
+ Error(ERR_
WA
RN,
"cannot create network server process - no network games");
options.network = FALSE;
return;
"cannot create network server process - no network games");
options.network = FALSE;
return;
@@
-226,10
+226,11
@@
boolean ConnectToServer(char *host, int port)
void SendToServer_Nickname(char *nickname)
{
static char msgbuf[300];
void SendToServer_Nickname(char *nickname)
{
static char msgbuf[300];
+ int len_nickname = strlen(nickname);
buf[1] = OP_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);
}
sprintf(msgbuf, "you set your nick to \"%s\"", nickname);
sysmsg(msgbuf);
}
@@
-303,7
+304,7
@@
void SendToServer_MovePlayer(byte player_action)
static void Handle_OP_BAD_PROTOCOL_VERSION()
{
static void Handle_OP_BAD_PROTOCOL_VERSION()
{
- Error(ERR_
RETU
RN, "protocol version mismatch");
+ Error(ERR_
WA
RN, "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);
}
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);
}
@@
-324,7
+325,6
@@
static void Handle_OP_YOUR_NUMBER()
*new_local_player = *old_local_player;
old_local_player->connected = FALSE;
*new_local_player = *old_local_player;
old_local_player->connected = FALSE;
- old_local_player->local = FALSE;
local_player = new_local_player;
}
local_player = new_local_player;
}
@@
-373,7
+373,6
@@
static void Handle_OP_NUMBER_WANTED()
*new_player = *old_player;
old_player->connected = FALSE;
*new_player = *old_player;
old_player->connected = FALSE;
- old_player->local = FALSE;
}
u = finduser(old_client_nr);
}
u = finduser(old_client_nr);
@@
-480,25
+479,39
@@
static void Handle_OP_START_PLAYING()
if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0)
if (strcmp(leveldir[new_leveldir_nr].name, new_leveldir_name) != 0)
- Error(ERR_
RETU
RN, "no such level directory: '%s'",new_leveldir_name);
+ Error(ERR_
WA
RN, "no such level directory: '%s'",new_leveldir_name);
leveldir_nr = new_leveldir_nr;
leveldir_nr = new_leveldir_nr;
+ /*
local_player->leveldir_nr = leveldir_nr;
local_player->leveldir_nr = leveldir_nr;
+ */
+
+
+ /*
+ SaveLevelSetup();
+ */
+
+ /*
LoadPlayerInfo(PLAYER_LEVEL);
SavePlayerInfo(PLAYER_SETUP);
LoadPlayerInfo(PLAYER_LEVEL);
SavePlayerInfo(PLAYER_SETUP);
+ */
+
level_nr = new_level_nr;
TapeErase();
level_nr = new_level_nr;
TapeErase();
- Load
Level
Tape(level_nr);
+ LoadTape(level_nr);
+ /*
GetPlayerConfig();
GetPlayerConfig();
+ */
+
LoadLevel(level_nr);
LoadLevel(level_nr);
- if (setup.autorecord
_on
)
+ if (setup.autorecord)
TapeStartRecording();
TapeStartRecording();
@@
-568,7
+581,7
@@
static void Handle_OP_MOVE_FIGURE(unsigned int len)
/* copy valid player actions */
for (i=0; i<MAX_PLAYERS; i++)
/* copy valid player actions */
for (i=0; i<MAX_PLAYERS; i++)
- stored_player[i].action =
+ stored_player[i].
effective_
action =
(i < len - 6 && stored_player[i].active ? buf[6 + i] : 0);
network_player_action_received = TRUE;
(i < len - 6 && stored_player[i].active ? buf[6 + i] : 0);
network_player_action_received = TRUE;