projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981026-1
[rocksndiamonds.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index a58c6621eb1b1a3e43975a9c1577101f9a6f5e4c..3f51426c4102ae01f9032a1fab1b3368f0a9ab8e 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;
@@
-303,7
+303,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);
}
@@
-480,13
+480,21
@@
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;
local_player->leveldir_nr = leveldir_nr;
leveldir_nr = new_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;
level_nr = new_level_nr;