gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 14:27:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r1042) -Fix: [Network] Hopefully enabled revision-check for windows (somehow

Browse Source 
windows uses WITH_REV_HACK instead of WITH_REV :s)
This commit is contained in:
truelight 2004-12-13 09:01:24 +00:00
parent 523b37a3e9
commit c0603e4768
5 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
console.c
View File

@ -231,9 +231,14 @@ static void IConsoleWndProc(Window* w, WindowEvent* e)
void IConsoleInit(void) void IConsoleInit(void)
{ {
uint i; uint i;
#ifdef WITH_REV_HACK
#define WITH_REV
const char _openttd_revision[] = WITH_REV_HACK;
#else
#if defined(WITH_REV) #if defined(WITH_REV)
extern char _openttd_revision[]; extern char _openttd_revision[];
#endif #endif
#endif
_iconsole_output_file = NULL; _iconsole_output_file = NULL;
_iconsole_color_default = 1; _iconsole_color_default = 1;
_iconsole_color_error = 3; _iconsole_color_error = 3;
@ -588,7 +593,7 @@ void IConsoleVarRegister(const char* name, void* addr, _iconsole_var_types type)
item_new->hook_access = NULL; item_new->hook_access = NULL;
item_new->hook_after_change = NULL; item_new->hook_after_change = NULL;
item_new->hook_before_change = NULL; item_new->hook_before_change = NULL;
} }
void IConsoleVarMemRegister(const char* name, _iconsole_var_types type) void IConsoleVarMemRegister(const char* name, _iconsole_var_types type)

9
network.c
View File

@ -785,10 +785,15 @@ bool NetworkClientConnectGame(const byte* host, unsigned short port)
void NetworkInitGameInfo(void) void NetworkInitGameInfo(void)
{ {
#if defined(WITH_REV) #ifdef WITH_REV_HACK
extern char _openttd_revision[]; #define WITH_REV
const char _openttd_revision[] = WITH_REV_HACK;
#else #else
#if defined(WITH_REV)
extern char _openttd_revision[];
#else
const char _openttd_revision[] = "norev000"; const char _openttd_revision[] = "norev000";
#endif
#endif #endif
NetworkClientInfo *ci; NetworkClientInfo *ci;

9
network_client.c
View File

@ -56,10 +56,15 @@ DEF_CLIENT_SEND_COMMAND(PACKET_CLIENT_JOIN)
// String: Unique id to find the player back in server-listing // String: Unique id to find the player back in server-listing
// //
#if defined(WITH_REV) #ifdef WITH_REV_HACK
extern char _openttd_revision[]; #define WITH_REV
const char _openttd_revision[] = WITH_REV_HACK;
#else #else
#if defined(WITH_REV)
extern char _openttd_revision[];
#else
const char _openttd_revision[] = "norev000"; const char _openttd_revision[] = "norev000";
#endif
#endif #endif
Packet *p; Packet *p;
_network_join_status = NETWORK_JOIN_STATUS_AUTHORIZING; _network_join_status = NETWORK_JOIN_STATUS_AUTHORIZING;

9
network_gui.c
View File

@ -47,8 +47,13 @@ enum {
static NetworkGameList *_selected_item = NULL; static NetworkGameList *_selected_item = NULL;
static int8 _selected_company_item = -1; static int8 _selected_company_item = -1;
#ifdef WITH_REV #ifdef WITH_REV_HACK
extern char _openttd_revision[]; #define WITH_REV
const char _openttd_revision[] = WITH_REV_HACK;
#else
#ifdef WITH_REV
extern char _openttd_revision[];
#endif
#endif #endif
// Truncates a string to max_width (via GetStringWidth) and adds 3 dots // Truncates a string to max_width (via GetStringWidth) and adds 3 dots

2
network_server.c
View File

@ -577,7 +577,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN)
NetworkRecv_string(p, client_revision, sizeof(client_revision)); NetworkRecv_string(p, client_revision, sizeof(client_revision));
// Too bad, when WITH_REV is disabled, we can not compare the version. // Too bad, when WITH_REV is disabled, we can not compare the version.
#if defined(WITH_REV) #if defined(WITH_REV) || defined (WITH_REV_HACK)
// Check if the client has WITH_REV enabled // Check if the client has WITH_REV enabled
if (strncmp("norev000", client_revision, sizeof(client_revision)) != 0) { if (strncmp("norev000", client_revision, sizeof(client_revision)) != 0) {
if (strncmp(_network_game_info.server_revision, client_revision, sizeof(_network_game_info.server_revision)) != 0) { if (strncmp(_network_game_info.server_revision, client_revision, sizeof(_network_game_info.server_revision)) != 0) {