From 10e518110a7a5390cf001c7aedfad99b2ad2ba94 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 12 May 2008 19:41:21 +0000 Subject: [PATCH] - bugfix mp: ctd if client opens inventory in tactical, if server and client had selected different inventory in the start new game screen. Now I changed that, so each client can decide new or old inventory. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2149 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 6 +++--- Multiplayer/client.cpp | 2 +- Multiplayer/network.h | 2 +- Multiplayer/server.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 476cda9a9..7b0201caf 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -13,12 +13,12 @@ #ifdef JA2EDITOR //MAP EDITOR BUILD VERSION -CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2147" }; +CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2148" }; #elif defined JA2BETAVERSION //BETA/TEST BUILD VERSION -CHAR16 zVersionLabel[256] = { L"Debug v1.13.2147" }; +CHAR16 zVersionLabel[256] = { L"Debug v1.13.2148" }; #elif defined CRIPPLED_VERSION @@ -28,7 +28,7 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - CHAR16 zVersionLabel[256] = { L"Release v1.13.2147" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.2148" }; #endif diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index e058b3a1e..caff04c14 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -1886,7 +1886,7 @@ void recieveSETTINGS (RPCParameters *rpcParameters) //recive settings from serve gGameOptions.fIronManMode=cl_lan->sofIronManMode; gGameOptions.ubBobbyRay=cl_lan->soubBobbyRay; - gGameOptions.ubInventorySystem=cl_lan->sofNewInv; + //gGameOptions.ubInventorySystem=cl_lan->sofNewInv; if(!cl_lan->soDis_Bobby)LaptopSaveInfo.fBobbyRSiteCanBeAccessed = TRUE; diff --git a/Multiplayer/network.h b/Multiplayer/network.h index ea706dfb0..bab8bb899 100644 --- a/Multiplayer/network.h +++ b/Multiplayer/network.h @@ -36,7 +36,7 @@ typedef struct BOOLEAN sofTurnTimeLimit; BOOLEAN sofIronManMode; UINT8 soubBobbyRay; - BOOLEAN sofNewInv; // WANNE - MP: New inventory + //BOOLEAN sofNewInv; // WANNE - MP: New inventory: Removed, so now each client can decide if playing with old or new inventory INT32 gsMAX_MERCS; UINT8 client_num; char client_name[30]; diff --git a/Multiplayer/server.cpp b/Multiplayer/server.cpp index c1b4895e4..cc938a75d 100644 --- a/Multiplayer/server.cpp +++ b/Multiplayer/server.cpp @@ -337,7 +337,7 @@ void requestSETTINGS(RPCParameters *rpcParameters ) lan.sofIronManMode=gGameOptions.fIronManMode; lan.starting_balance=gsstarting_balance; - lan.sofNewInv=gGameOptions.ubInventorySystem; + //lan.sofNewInv=gGameOptions.ubInventorySystem; lan.soDis_Bobby=gsDis_Bobby; lan.soDis_Equip=gsDis_Equip;