projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-19981123-5
[rocksndiamonds.git]
/
src
/
network.c
diff --git
a/src/network.c
b/src/network.c
index 3989065e51c59d6b4ba7660bab17b6e14523a71f..2bf2346f95926febb8db2854255941e8c15211af 100644
(file)
--- a/
src/network.c
+++ b/
src/network.c
@@
-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);
}
@@
-237,9
+238,9
@@
void SendToServer_Nickname(char *nickname)
void SendToServer_ProtocolVersion()
{
buf[1] = OP_PROTOCOL_VERSION;
void SendToServer_ProtocolVersion()
{
buf[1] = OP_PROTOCOL_VERSION;
- buf[2] = PROT
_VERS
_1;
- buf[3] = PROT
_VERS
_2;
- buf[4] = PROT
_VERS
_3;
+ buf[2] = PROT
OCOL_VERSION
_1;
+ buf[3] = PROT
OCOL_VERSION
_2;
+ buf[4] = PROT
OCOL_VERSION
_3;
sendbuf(5);
}
sendbuf(5);
}
@@
-305,7
+306,8
@@
static void Handle_OP_BAD_PROTOCOL_VERSION()
{
Error(ERR_WARN, "protocol version mismatch");
Error(ERR_EXIT, "server expects %d.%d.x instead of %d.%d.%d",
{
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);
+ buf[2], buf[3],
+ PROTOCOL_VERSION_1, PROTOCOL_VERSION_2, PROTOCOL_VERSION_3);
}
static void Handle_OP_YOUR_NUMBER()
}
static void Handle_OP_YOUR_NUMBER()
@@
-500,7
+502,7
@@
static void Handle_OP_START_PLAYING()
level_nr = new_level_nr;
TapeErase();
level_nr = new_level_nr;
TapeErase();
- Load
Level
Tape(level_nr);
+ LoadTape(level_nr);
/*
GetPlayerConfig();
/*
GetPlayerConfig();
@@
-580,7
+582,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;
@@
-658,26
+660,10
@@
static void HandleNetworkingMessages()
sysmsg(msgbuf);
break;
sysmsg(msgbuf);
break;
- case OP_ZERO:
- printf("OP_ZERO: %d\n", buf[0]);
- sprintf(msgbuf, "client %d resets game counters", buf[0]);
- sysmsg(msgbuf);
- break;
-
case OP_MSG:
printf("OP_MSG: %d\n", buf[0]);
sprintf(msgbuf, "client %d sends message", buf[0]);
break;
case OP_MSG:
printf("OP_MSG: %d\n", buf[0]);
sprintf(msgbuf, "client %d sends message", buf[0]);
break;
-
- case OP_LOST:
- printf("OP_MSG: %d\n", buf[0]);
- sprintf(msgbuf, "client %d has lost", buf[0]);
- break;
-
- case OP_LEVEL:
- printf("OP_MSG: %d\n", buf[0]);
- sprintf(msgbuf, "client %d sets level to %d", buf[0], buf[2]);
- break;
}
}
}
}