From 33291a713eeed81cca18d2381628b84d95684e3a Mon Sep 17 00:00:00 2001 From: Wanne Date: Sun, 30 Sep 2012 09:54:43 +0000 Subject: [PATCH] - MP Bugfix: Sets the starting selected sector as the same for clients (by haydent) 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 --- Multiplayer/client.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Multiplayer/client.cpp b/Multiplayer/client.cpp index ebf38c3bc..7e595c0d7 100644 --- a/Multiplayer/client.cpp +++ b/Multiplayer/client.cpp @@ -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 );