1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- 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.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2008-05-12 19:41:21 +00:00
parent 1b5393014d
commit 10e518110a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+3 -3
View File
@@ -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
Multiplayer/client.cpp
+1 -1
View File
@@ -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;
Multiplayer/network.h
+1 -1
View File
@@ -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];
Multiplayer/server.cpp
+1 -1
View File
@@ -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;