mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r8372) -Fix (8361): NUM_LANDSCAPE comes (via some detour) from openttd.h, which does not exist in the masterserver/updater.

release/0.6
rubidium 2007-01-23 14:47:38 +00:00
parent c856c26611
commit 269c1a58a0
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/network/core/config.h
View File

@ -42,6 +42,15 @@ enum {
NETWORK_MAX_GRF_COUNT = 55, NETWORK_MAX_GRF_COUNT = 55,
NETWORK_NUM_LANGUAGES = 4, ///< Number of known languages (to the network protocol) + 1 for 'any'. NETWORK_NUM_LANGUAGES = 4, ///< Number of known languages (to the network protocol) + 1 for 'any'.
/**
* The number of landscapes in OpenTTD.
* This number must be equal to NUM_LANDSCAPE, but as this number is used
* within the network code and that the network code is shared with the
* masterserver/updater, it has to be declared in here too. In network.cpp
* there is a compile assertion to check that this NUM_LANDSCAPE is equal
* to NETWORK_NUM_LANDSCAPES.
*/
NETWORK_NUM_LANDSCAPES = 4,
}; };
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */

4
src/network/core/udp.cpp
View File

@ -300,8 +300,8 @@ void NetworkUDPSocketHandler::Recv_NetworkGameInfo(Packet *p, NetworkGameInfo *i
info->map_set = NetworkRecv_uint8 (this, p); info->map_set = NetworkRecv_uint8 (this, p);
info->dedicated = (NetworkRecv_uint8(this, p) != 0); info->dedicated = (NetworkRecv_uint8(this, p) != 0);
if (info->server_lang >= NETWORK_NUM_LANGUAGES) info->server_lang = 0; if (info->server_lang >= NETWORK_NUM_LANGUAGES) info->server_lang = 0;
if (info->map_set >= NUM_LANDSCAPE) info->map_set = 0; if (info->map_set >= NETWORK_NUM_LANDSCAPES) info->map_set = 0;
} }
} }

3
src/network/network.cpp
View File

@ -38,6 +38,9 @@
#include <stdarg.h> /* va_list */ #include <stdarg.h> /* va_list */
#include "../md5.h" #include "../md5.h"
/* Check whether NETWORK_NUM_LANDSCAPES is still in sync with NUM_LANDSCAPE */
assert_compile((int)NETWORK_NUM_LANDSCAPES == (int)NUM_LANDSCAPE);
// global variables (declared in network_data.h) // global variables (declared in network_data.h)
CommandPacket *_local_command_queue; CommandPacket *_local_command_queue;