Merge pull request #220 from bittiez/dev

v3.21.3
jsebold666 · Feb 22, 2024 · b92c111 · b92c111
2 parents 004adfb + 4b18fbc
commit b92c111
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/src/ClassicUO.Client/ClassicUO.Client.csproj b/src/ClassicUO.Client/ClassicUO.Client.csproj
@@ -5,8 +5,8 @@
  <ApplicationIcon>cuoicon.ico</ApplicationIcon>
  <AssemblyName>ClassicUO</AssemblyName>
  <RootNamespace>ClassicUO</RootNamespace>
- <AssemblyVersion>3.21.2</AssemblyVersion>
- <FileVersion>3.21.2</FileVersion>
+ <AssemblyVersion>3.21.3</AssemblyVersion>
+ <FileVersion>3.21.3</FileVersion>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(Configuration)'=='Release'">

diff --git a/src/ClassicUO.Client/Game/UI/Controls/Control.cs b/src/ClassicUO.Client/Game/UI/Controls/Control.cs
@@ -315,6 +315,28 @@ public virtual bool Draw(UltimaBatcher2D batcher, int x, int y)
  }
 
  batcher.ClipBegin(x + offset, y + offset, Width - (offset * 2), Height - (offset * 2));
+
+ for (int i = 0; i < Children.Count; i++)
+ {
+ if (Children.Count <= i)
+ {
+ break;
+ }
+ Control c = Children.ElementAt(i);
+
+ if (c != null && (c.Page == 0 || c.Page == ActivePage))
+ {
+ if (c.IsVisible)
+ {
+ c.Draw(batcher, c.X + x, c.Y + y);
+ }
+ }
+ }
+
+ DrawDebug(batcher, x, y);
+
+ batcher.ClipEnd();
+ return true;
  }
 
  for (int i = 0; i < Children.Count; i++)
@@ -336,11 +358,6 @@ public virtual bool Draw(UltimaBatcher2D batcher, int x, int y)
 
  DrawDebug(batcher, x, y);
 
- if (delayedDispose)
- {
- batcher.ClipEnd();
- }
-
  return true;
  }
 
@@ -1045,7 +1062,7 @@ public virtual void Dispose()
 
  if (this is Gumps.Gump)
  {
- if (!delayedDispose && World.InGame && Parent == null && ProfileManager.CurrentProfile != null && ProfileManager.CurrentProfile.EnableGumpCloseAnimation)
+ if (!delayedDispose && !IsFromServer && World.InGame && Parent == null && ProfileManager.CurrentProfile != null && ProfileManager.CurrentProfile.EnableGumpCloseAnimation)
  {
  delayedDispose = true;
  return;

diff --git a/src/ClassicUO.Client/Game/UI/Gumps/VersionHistory.cs b/src/ClassicUO.Client/Game/UI/Gumps/VersionHistory.cs
@@ -8,8 +8,11 @@ namespace ClassicUO.Game.UI.Gumps
  internal class VersionHistory : Gump
  {
  private static string[] updateTexts = {
+ "/c[white][3.21.3]/cd\n" +
+ "- Changes to improve gump closing animations",
+
  "/c[white][3.21.2]/cd\n" +
- "-A bugfix release for 3.21 causing crashes",
+ "- A bugfix release for 3.21 causing crashes",
 
  "/c[white][3.21.0]/cd\n" +
  "- A few bug fixes\n" +