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

- MP Bugfix: Sets the starting selected sector as the same for clients (by haydent)

Browse Source 
o There was a bug where if sector chosen before clients join, when they join they wont see this choice

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5589 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-09-30 09:54:43 +00:00
parent 82b10b0e08
commit 33291a713e
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+9 -6
View File
@@ -2337,8 +2337,10 @@ void recieveSETTINGS (RPCParameters *rpcParameters) //recive settings from serve
cDamageMultiplier=cl_lan->damageMultiplier;
cSameMercAllowed=cl_lan->sameMercAllowed;
gsMercArriveSectorX=cl_lan->gsMercArriveSectorX;
gsMercArriveSectorY=cl_lan->gsMercArriveSectorY;
gsMercArriveSectorX = gGameExternalOptions.ubDefaultArrivalSectorX = cl_lan->gsMercArriveSectorX;
gsMercArriveSectorY = gGameExternalOptions.ubDefaultArrivalSectorY = cl_lan->gsMercArriveSectorY;
// WANNE - BMP: We have to initialize the map size here!!
InitializeWorldSize(gsMercArriveSectorX, gsMercArriveSectorY, 0);
@@ -2568,8 +2570,8 @@ void reapplySETTINGS()
gMercProfiles[ 68 ].sSalary = 2200; //iggy;
// Stuff from recieveSETTINGS
gsMercArriveSectorX=gMPServerSettings.gsMercArriveSectorX;
gsMercArriveSectorY=gMPServerSettings.gsMercArriveSectorY;
gsMercArriveSectorX = gGameExternalOptions.ubDefaultArrivalSectorX = gMPServerSettings.gsMercArriveSectorX;
gsMercArriveSectorY = gGameExternalOptions.ubDefaultArrivalSectorY = gMPServerSettings.gsMercArriveSectorY;
cGameType=gMPServerSettings.gameType;
cDisableMorale=gMPServerSettings.disableMorale;
@@ -2788,8 +2790,9 @@ void recieveMAPCHANGE( RPCParameters *rpcParameters )
else
{
// copy new map settings locally
gsMercArriveSectorX=cl_lan->gsMercArriveSectorX;
gsMercArriveSectorY=cl_lan->gsMercArriveSectorY;
gsMercArriveSectorX = gGameExternalOptions.ubDefaultArrivalSectorX = cl_lan->gsMercArriveSectorX;
gsMercArriveSectorY = gGameExternalOptions.ubDefaultArrivalSectorY = cl_lan->gsMercArriveSectorY;
ChangeSelectedMapSector( gsMercArriveSectorX, gsMercArriveSectorY, 0 );