[UI] Skin/Pet Selector

riperiperi · Jun 25, 2018 · 00f8cd6 · 00f8cd6
1 parent 4ac3845
commit 00f8cd6
Show file tree

Hide file tree

Showing 8 changed files with 532 additions and 7 deletions.
diff --git a/Client/Simitone/Simitone.Client/Simitone.Client.csproj b/Client/Simitone/Simitone.Client/Simitone.Client.csproj
@@ -75,6 +75,7 @@
  <Compile Include="UI\Panels\LiveSubpanels\UISubpanel.cs" />
  <Compile Include="UI\Panels\LotControls\UIArchTouchHelper.cs" />
  <Compile Include="UI\Panels\LotControls\UICallNeighborAlert.cs" />
+ <Compile Include="UI\Panels\LotControls\UISelectSkinAlert.cs" />
  <Compile Include="UI\Panels\UIClockPanel.cs" />
  <Compile Include="UI\Panels\UICutawayPanel.cs" />
  <Compile Include="UI\Panels\UIHouseSelectPanel.cs" />
@@ -111,6 +112,7 @@
  <ProjectReference Include="..\..\..\FreeSO\Other\libs\FSOMonoGame\MonoGame.Framework\MonoGame.Framework.Windows.csproj">
  <Project>{7de47032-a904-4c29-bd22-2d235e8d91ba}</Project>
  <Name>MonoGame.Framework.Windows</Name>
+ <Private>False</Private>
  </ProjectReference>
  <ProjectReference Include="..\..\..\FreeSO\TSOClient\FSO.UI\FSO.UI.csproj">
  <Project>{73e2ad5b-720b-4ef3-9b7c-55931d0ec693}</Project>

diff --git a/Client/Simitone/Simitone.Client/SimitoneGame.cs b/Client/Simitone/Simitone.Client/SimitoneGame.cs
@@ -8,7 +8,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using System.Threading;
-using LogThis;
 using FSO.Common.Rendering.Framework;
 using FSO.LotView;
 using FSO.HIT;
@@ -98,10 +97,11 @@ protected override void Initialize()
 
  FSO.LotView.WorldConfig.Current = new FSO.LotView.WorldConfig()
  {
- LightingMode = 3,
+ LightingMode = settings.LightingMode,
  SmoothZoom = settings.SmoothZoom,
  SurroundingLots = settings.SurroundingLotMode,
- AA = settings.AntiAlias
+ AA = settings.AntiAlias,
+ Directional = settings.DirectionalLight3D
  };
 
  OperatingSystem os = Environment.OSVersion;
@@ -123,7 +123,11 @@ protected override void Initialize()
  GameFacade.GraphicsDevice = GraphicsDevice;
  GameFacade.GraphicsDeviceManager = Graphics;
  GameFacade.Cursor = new CursorManager(GraphicsDevice);
- if (!GameFacade.Linux) GameFacade.Cursor.Init(GlobalSettings.Default.TS1HybridPath, true);
+ if (!GameFacade.Linux)
+ {
+ CurLoader.BmpLoaderFunc = ImageLoader.BaseFunction;
+ GameFacade.Cursor.Init(GlobalSettings.Default.TS1HybridPath, true);
+ }
 
  /** Init any computed values **/
  GameFacade.Init();