Merge pull request #27 from bittiez/update-cuo

Update cuo
jsebold666 · Mar 14, 2023 · 10c17ab · 10c17ab
2 parents 5aa99ad + 8376e9a
commit 10c17ab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/ClassicUO.Client/Game/GameObjects/RenderedText.cs b/src/ClassicUO.Client/Game/GameObjects/RenderedText.cs
@@ -687,7 +687,9 @@ public unsafe void CreateTexture()
  );
  }
 
- if (fi.Data != null && fi.Data.Length > 0 && (Texture == null || Texture.IsDisposed))
+ var isValid = fi.Data != null && fi.Data.Length > 0;
+
+ if (isValid && (Texture == null || Texture.IsDisposed))
  {
  Texture = new Texture2D(Client.Game.GraphicsDevice, fi.Width, fi.Height, false, SurfaceFormat.Color);
  }
@@ -703,7 +705,7 @@ public unsafe void CreateTexture()
 
  LinesCount = fi.LineCount;
 
- if (Texture != null)
+ if (Texture != null && isValid)
  {
  fixed (uint* dataPtr = fi.Data)
  {

diff --git a/src/ClassicUO.Client/Game/UI/Gumps/HouseCustomizationGump.cs b/src/ClassicUO.Client/Game/UI/Gumps/HouseCustomizationGump.cs
@@ -235,7 +235,7 @@ public HouseCustomizationGump(uint serial, int x, int y) : base(serial, 0)
  }
 
 
- public override void Update()
+ public new void Update()
  {
  _dataBox.Clear();
  _dataBoxGUI.Clear();
@@ -2018,4 +2018,4 @@ private enum ID_GUMP_CUSTOM_HOUSE
  ID_GCH_ITEM_IN_LIST
  }
  }
-}
+}
diff --git a/src/ClassicUO.Utility/Extensions.cs b/src/ClassicUO.Utility/Extensions.cs
@@ -1,4 +1,4 @@
-#region license
+#region license
 
 // Copyright (c) 2021, andreakarasho
 // All rights reserved.
@@ -30,16 +30,15 @@
 
 #endregion
 
+using ClassicUO.Utility.Logging;
+using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Text;
 using System.Threading.Tasks;
-using ClassicUO.Utility.Logging;
-using Microsoft.Xna.Framework;
 
 namespace ClassicUO.Utility
 {
@@ -167,7 +166,7 @@ public static bool InRect(ref Rectangle rect, ref Rectangle r)
  return inrect;
  }
 
- 
+
 #if NETFRAMEWORK
  public static void ExtractToDirectory(this ZipArchive archive, string destinationDirectoryName, bool overwrite)
  {
@@ -221,4 +220,4 @@ public static string ToHex(this byte b)
  return $"0x{b:X2}";
  }
  }
-}
+}
diff --git a/tools/ManifestCreator/Program.cs b/tools/ManifestCreator/Program.cs
@@ -18,8 +18,8 @@ class Program
  "ClassicUO",
  "ClassicUO.Assets.dll",
  "ClassicUO.Utility.dll",
- "ClassicUO.IO",
- "ClassicUO.Renderer",
+ "ClassicUO.IO.dll",
+ "ClassicUO.Renderer.dll",
 
  "ClassicUO.bin.osx",
  "ClassicUO.bin.x86_64",