no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@426 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-10-08 11:57:33 +00:00
parent 7ff2d20385
commit eb23c4546e
19 changed files with 572 additions and 200 deletions
+8 -7
View File
@@ -173,7 +173,7 @@ void addmsg(int rel, int num, int type, ...)
void server_err()
{
conoutf("server network error, disconnecting...");
conoutf("server network error or player kick, disconnecting...");
disconnect();
};
@@ -220,6 +220,13 @@ void c2sinfo(dynent *d) // send update to the server
toservermap[0] = 0;
putint(p, nextmode);
}
else if(masterpwd[0])
{
packet->flags = ENET_PACKET_FLAG_RELIABLE;
putint(p, SV_GETMASTER);
sendstring(masterpwd, p);
masterpwd[0] = 0;
}
else
{
putint(p, SV_POS);
@@ -242,12 +249,6 @@ void c2sinfo(dynent *d) // send update to the server
putint(p, player1->gunselect);
gun_changed = false;
};
if(masterpwd[0])
{
putint(p, SV_GETMASTER);
sendstring(masterpwd, p);
masterpwd[0] = 0;
};
if(senditemstoserver)
{
packet->flags = ENET_PACKET_FLAG_RELIABLE;