X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnetserv.c;h=10b0ab504d5615a66dc17e9221e7630f7bd60238;hb=cec9eb9aaa3619d50b565219445dd1fdd4d9bd39;hp=178e89e3265831a271b365e87be66a148264103f;hpb=0a87fde47bcff35f196024766f8d0d00319a28d1;p=rocksndiamonds.git diff --git a/src/netserv.c b/src/netserv.c index 178e89e3..10b0ab50 100644 --- a/src/netserv.c +++ b/src/netserv.c @@ -11,9 +11,8 @@ * network.c * ***********************************************************/ -#ifndef MSDOS +#if !defined(MSDOS) && !defined(WIN32) -#include #include #include #include @@ -34,7 +33,7 @@ static int onceonly = 0; struct NetworkServerPlayerInfo { int fd; - unsigned char player_name[16]; + char player_name[16]; unsigned char number; struct NetworkServerPlayerInfo *next; char active; @@ -283,7 +282,8 @@ static void Handle_OP_PLAYER_NAME(struct NetworkServerPlayerInfo *player, for (i=0; iplayer_name[i] < ' ' || - (player->player_name[i] > 0x7e && player->player_name[i] <= 0xa0)) + ((unsigned char)(player->player_name[i]) > 0x7e && + (unsigned char)(player->player_name[i]) <= 0xa0)) { player->player_name[i] = 0; break; @@ -348,7 +348,7 @@ static void Handle_OP_START_PLAYING(struct NetworkServerPlayerInfo *player) v->action_received = FALSE; } - broadcast(NULL, 10 + strlen(&buffer[10])+1, 0); + broadcast(NULL, 10 + strlen((char *)&buffer[10])+1, 0); } static void Handle_OP_PAUSE_PLAYING(struct NetworkServerPlayerInfo *player) @@ -661,4 +661,4 @@ void NetworkServer(int port, int serveronly) } } -#endif /* !MSDOS */ +#endif /* !MSDOS && !WIN32 */