diff options
author | darkvater <darkvater@openttd.org> | 2004-09-07 19:34:55 +0000 |
---|---|---|
committer | darkvater <darkvater@openttd.org> | 2004-09-07 19:34:55 +0000 |
commit | 3a241b5ccec2b5f5eb803efbd32f55a5d1de5d97 (patch) | |
tree | fb71b493be30cef91bba060419f951a7a3941f2f /network.c | |
parent | bf9c8068be695e95662a541eb76465d60af6c976 (diff) | |
download | openttd-3a241b5ccec2b5f5eb803efbd32f55a5d1de5d97.tar.xz |
(svn r176) -Fix: network_gui const and warnings fixes (Tron)
Diffstat (limited to 'network.c')
-rw-r--r-- | network.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -191,7 +191,7 @@ typedef struct FutureSeeds { // remember some future seeds that the server sent to us. static FutureSeeds _future_seed[8]; -static int _num_future_seed; +static uint _num_future_seed; static SOCKET _listensocket; // tcp socket @@ -683,7 +683,7 @@ static bool ReadPackets(ClientState *cs) } } - assert(size>=0 && size < sizeof(cs->buf)); + assert(size < sizeof(cs->buf)); memcpy(cs->buf, network_buffer + pos, size); } @@ -1307,7 +1307,7 @@ void NetworkUDPSend(bool client, struct sockaddr_in recv,struct UDPPacket packet } -bool NetworkUDPSearchGame(byte ** _network_detected_serverip, unsigned short * _network_detected_serverport) { +bool NetworkUDPSearchGame(const byte ** _network_detected_serverip, unsigned short * _network_detected_serverport) { struct UDPPacket packet; int timeout=3000; @@ -1336,7 +1336,7 @@ bool NetworkUDPSearchGame(byte ** _network_detected_serverip, unsigned short * _ } - return (_network_detected_serverport>0); + return (*_network_detected_serverport>0); } @@ -1478,11 +1478,11 @@ DEBUG(misc,3) ("[NET][Core] shutdown()"); /* *************************************************** */ -bool NetworkCoreConnectGame(byte* b, unsigned short port) +bool NetworkCoreConnectGame(const byte* b, unsigned short port) { if (!_network_available) return false; - if (strcmp((char *) b,"auto")==0) { + if (strcmp(b,"auto")==0) { // do autodetect NetworkUDPSearchGame(&b, &port); } |