From 35266309d0b16c56b3df378dbbfb574435084767 Mon Sep 17 00:00:00 2001 From: zico Date: Thu, 19 Dec 2013 14:03:00 +0100 Subject: [PATCH] Made version mismatch screen spill out some explanatory information about Multi protocol version --- common/main/multi.h | 2 +- similar/main/net_udp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/main/multi.h b/common/main/multi.h index 265e1a4f4..3ead2f7ec 100644 --- a/common/main/multi.h +++ b/common/main/multi.h @@ -61,7 +61,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. extern int multi_protocol; // set and determinate used protocol #define MULTI_PROTO_UDP 1 // UDP protocol -// What version of the multiplayer protocol is this? Increment each time something drastic changes in Multiplayer without the version number changes. Can be reset to 0 each time the version of the game changes +// What version of the multiplayer protocol is this? Increment each time something drastic changes in Multiplayer without the version number changes. Reset to 0 each time the version of the game changes #define MULTI_PROTO_VERSION 11 // PROTOCOL VARIABLES AND DEFINES - END diff --git a/similar/main/net_udp.cpp b/similar/main/net_udp.cpp index cc4312cd4..44862032d 100644 --- a/similar/main/net_udp.cpp +++ b/similar/main/net_udp.cpp @@ -552,7 +552,7 @@ static int net_udp_game_connect(direct_join *dj) if (Netgame.protocol.udp.valid == -1) { - nm_messagebox(TXT_ERROR,1,TXT_OK,"Version mismatch! Cannot join Game.\nHost game version: %i.%i.%i\nHost game protocol: %i\nYour game version: %s\nYour game protocol: %i",Netgame.protocol.udp.program_iver[0],Netgame.protocol.udp.program_iver[1],Netgame.protocol.udp.program_iver[2],Netgame.protocol.udp.program_iver[3],VERSION, MULTI_PROTO_VERSION); + nm_messagebox(TXT_ERROR,1,TXT_OK,"Version mismatch! Cannot join Game.\n\nHost game version: %i.%i.%i\nHost game protocol: %i\n(%s)\n\nYour game version: %s\nYour game protocol: %i\n(%s)",Netgame.protocol.udp.program_iver[0],Netgame.protocol.udp.program_iver[1],Netgame.protocol.udp.program_iver[2],Netgame.protocol.udp.program_iver[3],(Netgame.protocol.udp.program_iver[3]==0?"RELEASE VERSION":"DEVELOPMENT BUILD, BETA, etc."),VERSION, MULTI_PROTO_VERSION, (MULTI_PROTO_VERSION==0?"RELEASE VERSION":"DEVELOPMENT BUILD, BETA, etc.")); dj->connecting = 0; return 0; }