diff --git a/Client/Simitone/Simitone.Client/UI/Panels/UILotControl.cs b/Client/Simitone/Simitone.Client/UI/Panels/UILotControl.cs index 5080836..b10c654 100644 --- a/Client/Simitone/Simitone.Client/UI/Panels/UILotControl.cs +++ b/Client/Simitone/Simitone.Client/UI/Panels/UILotControl.cs @@ -801,6 +801,9 @@ namespace Simitone.Client.UI.Panels if (ShowTooltip) state.UIState.TooltipProperties.UpdateDead = false; bool scrolled = false; + + World.State.Cameras.CameraFirstPerson.CaptureMouse = true; + if (RMBScroll) { World.State.ScrollAnchor = null; diff --git a/Client/Simitone/Simitone.Client/UI/Screens/TS1GameScreen.cs b/Client/Simitone/Simitone.Client/UI/Screens/TS1GameScreen.cs index f1eeace..1032bdb 100644 --- a/Client/Simitone/Simitone.Client/UI/Screens/TS1GameScreen.cs +++ b/Client/Simitone/Simitone.Client/UI/Screens/TS1GameScreen.cs @@ -648,6 +648,7 @@ namespace Simitone.Client.UI.Screens subworld.State.Level = 5; var subHeight = tempVM.Context.Blueprint.InterpAltitude(new Vector3(0, 0, 0)); tempVM.Context.Blueprint.BaseAlt = (int)Math.Round(((subHeight - myHeight) + myH.Position.Y - h.Position.Y) / tempVM.Context.Blueprint.TerrainFactor); + subworld.UseFade = false; subworld.GlobalPosition = new Vector2((myH.Position.X - h.Position.X), (myH.Position.Z - h.Position.Z)); foreach (var obj in tempVM.Entities) diff --git a/FreeSO b/FreeSO index 77066aa..05ce4a5 160000 --- a/FreeSO +++ b/FreeSO @@ -1 +1 @@ -Subproject commit 77066aa2865301ea72e0ca238f0a42ba04d59625 +Subproject commit 05ce4a53b84b89715f4b5781282d911046f23651