From 325d02ef53b697bad79d4003d3a5d6fae3501811 Mon Sep 17 00:00:00 2001 From: Bryan Denny Date: Mon, 23 Dec 2024 01:21:32 -0500 Subject: [PATCH 01/51] #24 rolling forward to 8/20/2020 CUO commit 072c3b2 --- .../src/Game/UI/Controls/StbTextBox.cs | 20 +++++++++++++++++-- external/ClassicUO | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs index e8bb36098..c08438a79 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs @@ -382,7 +382,7 @@ protected override void OnKeyDown(SDL.SDL_Keycode key, SDL.SDL_Keymod mod) int selectStart = Math.Min(_stb.SelectStart, _stb.SelectEnd); int selectEnd = Math.Max(_stb.SelectStart, _stb.SelectEnd); - if (selectStart < selectEnd && selectStart >= 0 && selectEnd - selectStart < Text.Length) + if (selectStart < selectEnd && selectStart >= 0 && selectEnd - selectStart <= Text.Length) { SDL.SDL_SetClipboardText(Text.Substring(selectStart, selectEnd - selectStart)); } @@ -392,7 +392,7 @@ protected override void OnKeyDown(SDL.SDL_Keycode key, SDL.SDL_Keymod mod) selectStart = Math.Min(_stb.SelectStart, _stb.SelectEnd); selectEnd = Math.Max(_stb.SelectStart, _stb.SelectEnd); - if (selectStart < selectEnd && selectStart >= 0 && selectEnd - selectStart < Text.Length) + if (selectStart < selectEnd && selectStart >= 0 && selectEnd - selectStart <= Text.Length) { SDL.SDL_SetClipboardText(Text.Substring(selectStart, selectEnd - selectStart)); if (IsEditable) @@ -829,5 +829,21 @@ internal int TotalHeight return h; } } + + protected override bool OnMouseDoubleClick(int x, int y, MouseButtonType button) + { + if (!NoSelection && CaretIndex < Text.Length && CaretIndex >= 0 && !char.IsWhiteSpace(Text[CaretIndex])) + { + int idx = CaretIndex; + if (idx - 1 >= 0 && char.IsWhiteSpace(Text[idx - 1])) + idx = CaretIndex + 1; + SelectionStart = _stb.MoveToPreviousWord(idx); + SelectionEnd = _stb.MoveToNextWord(idx); + if (SelectionEnd < Text.Length) + --SelectionEnd; + return true; + } + return base.OnMouseDoubleClick(x, y, button); + } } } \ No newline at end of file diff --git a/external/ClassicUO b/external/ClassicUO index 303c2ae69..072c3b2fc 160000 --- a/external/ClassicUO +++ b/external/ClassicUO @@ -1 +1 @@ -Subproject commit 303c2ae699ca02caa6b09fbe5fbcb0c92f8bbd68 +Subproject commit 072c3b2fcefa5eff3ab5bcd3ce928e3929302847 From 6f6793d257051f26331602079409ac341604b132 Mon Sep 17 00:00:00 2001 From: Bryan Denny Date: Mon, 23 Dec 2024 01:59:14 -0500 Subject: [PATCH 02/51] #24 rolling forward to 8/25/2020 CUO commit f4992bdb --- .../Assistant/InternalUI/NiceButtonStbText.cs | 2 +- .../Scripts/ClassicUO/src/Game/GameCursor.cs | 4 +--- .../ClassicUO/src/Game/Scenes/GameScene.cs | 2 +- .../ClassicUO/src/Game/UI/Controls/ItemGump.cs | 2 +- .../src/Game/UI/Controls/StbTextBox.cs | 12 +++++++++++- .../ClassicUO/src/Game/UI/Gumps/ShopGump.cs | 2 +- .../src/Game/UI/Gumps/SystemChatControl.cs | 2 +- .../ClassicUO/src/Renderer/Batcher2D.cs | 2 +- .../ClassicUO/src/Renderer/RenderedText.cs | 18 +++++++++--------- .../src/Renderer/ShaderHueTranslator.cs | 1 + .../src/Renderer/ShaderHuesTraslator.cs | 1 - .../Utility/{Exstentions.cs => Extensions.cs} | 0 Assets/Scripts/UnityBatcher.cs | 2 +- external/ClassicUO | 2 +- 14 files changed, 30 insertions(+), 22 deletions(-) create mode 120000 Assets/Scripts/ClassicUO/src/Renderer/ShaderHueTranslator.cs delete mode 120000 Assets/Scripts/ClassicUO/src/Renderer/ShaderHuesTraslator.cs rename Assets/Scripts/ClassicUO/src/Utility/{Exstentions.cs => Extensions.cs} (100%) diff --git a/Assets/Scripts/Assistant/InternalUI/NiceButtonStbText.cs b/Assets/Scripts/Assistant/InternalUI/NiceButtonStbText.cs index f33cb7fe2..e57bba277 100644 --- a/Assets/Scripts/Assistant/InternalUI/NiceButtonStbText.cs +++ b/Assets/Scripts/Assistant/InternalUI/NiceButtonStbText.cs @@ -175,7 +175,7 @@ public override bool Draw(UltimaBatcher2D batcher, int x, int y) if (IsSelected) { ResetHueVector(); - ShaderHuesTraslator.GetHueVector(ref _hueVector, 0, false, Alpha); + ShaderHueTranslator.GetHueVector(ref _hueVector, 0, false, Alpha); if (_SelectedArea > 0) batcher.Draw2D(_texture, x + TextBoxes[_SelectedArea - 1].X, y, 0, 0, TextBoxes[_SelectedArea - 1].Width, Height, ref _hueVector); else diff --git a/Assets/Scripts/ClassicUO/src/Game/GameCursor.cs b/Assets/Scripts/ClassicUO/src/Game/GameCursor.cs index a63f23801..694da1b9c 100644 --- a/Assets/Scripts/ClassicUO/src/Game/GameCursor.cs +++ b/Assets/Scripts/ClassicUO/src/Game/GameCursor.cs @@ -28,12 +28,10 @@ using ClassicUO.Game.Managers; using ClassicUO.Game.Scenes; using ClassicUO.Game.UI; -using ClassicUO.Game.UI.Controls; using ClassicUO.Input; using ClassicUO.IO.Resources; using ClassicUO.Renderer; using ClassicUO.Utility; -using ClassicUO.Utility.Collections; using Microsoft.Xna.Framework; using Microsoft.Xna.Framework.Graphics; @@ -512,7 +510,7 @@ public void Draw(UltimaBatcher2D sb) int y = (ItemHold.IsFixedPosition ? ItemHold.FixedY : Mouse.Position.Y) - _offset.Y; Vector3 hue = Vector3.Zero; - ShaderHuesTraslator.GetHueVector(ref hue, ItemHold.Hue, ItemHold.IsPartialHue, ItemHold.HasAlpha ? .5f : 0); + ShaderHueTranslator.GetHueVector(ref hue, ItemHold.Hue, ItemHold.IsPartialHue, ItemHold.HasAlpha ? .5f : 0); sb.Draw2D(_draggedItemTexture, x, y, _draggedItemTexture.Width * scale, _draggedItemTexture.Height * scale, ref hue); diff --git a/Assets/Scripts/ClassicUO/src/Game/Scenes/GameScene.cs b/Assets/Scripts/ClassicUO/src/Game/Scenes/GameScene.cs index 4fd04afd1..76e4f204e 100644 --- a/Assets/Scripts/ClassicUO/src/Game/Scenes/GameScene.cs +++ b/Assets/Scripts/ClassicUO/src/Game/Scenes/GameScene.cs @@ -860,7 +860,7 @@ private void DrawLights(UltimaBatcher2D batcher) batcher.SetBlendState(BlendState.Additive); Vector3 hue = Vector3.Zero; - hue.Y = ShaderHuesTraslator.SHADER_LIGHTS; + hue.Y = ShaderHueTranslator.SHADER_LIGHTS; hue.Z = 0; for (int i = 0; i < _lightCount; i++) diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/ItemGump.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/ItemGump.cs index 85e88f664..9a3c2b3f8 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/ItemGump.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/ItemGump.cs @@ -88,7 +88,7 @@ public override bool Draw(UltimaBatcher2D batcher, int x, int y) base.Draw(batcher, x, y); ResetHueVector(); - ShaderHuesTraslator.GetHueVector(ref _hueVector, HighlightOnMouseOver && MouseIsOver ? 0x0035 : Hue, IsPartialHue, 0, false); + ShaderHueTranslator.GetHueVector(ref _hueVector, HighlightOnMouseOver && MouseIsOver ? 0x0035 : Hue, IsPartialHue, 0, false); var texture = ArtLoader.Instance.GetTexture(Graphic); diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs index c08438a79..c4c0f8d9e 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs @@ -524,6 +524,16 @@ protected override void OnKeyDown(SDL.SDL_Keycode key, SDL.SDL_Keymod mod) else { Parent?.OnKeyboardReturn(0, Text); + if (Managers.UIManager.SystemChat != null && Managers.UIManager.SystemChat.TextBoxControl != null && IsFocused) + { + if(!IsFromServer || !Managers.UIManager.SystemChat.TextBoxControl.IsVisible) + { + OnFocusLost(); + OnFocusEnter(); + } + else if (Managers.UIManager.KeyboardFocusControl == null || Managers.UIManager.KeyboardFocusControl != Managers.UIManager.SystemChat.TextBoxControl) + Managers.UIManager.SystemChat.TextBoxControl.SetKeyboardFocus(); + } } } break; @@ -836,7 +846,7 @@ protected override bool OnMouseDoubleClick(int x, int y, MouseButtonType button) { int idx = CaretIndex; if (idx - 1 >= 0 && char.IsWhiteSpace(Text[idx - 1])) - idx = CaretIndex + 1; + ++idx; SelectionStart = _stb.MoveToPreviousWord(idx); SelectionEnd = _stb.MoveToNextWord(idx); if (SelectionEnd < Text.Length) diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ShopGump.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ShopGump.cs index 139412f01..8bde77d6a 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ShopGump.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ShopGump.cs @@ -889,7 +889,7 @@ public override bool Draw(UltimaBatcher2D batcher, int x, int y) { ResetHueVector(); - ShaderHuesTraslator.GetHueVector(ref _hueVector, 0, false, Alpha, true); + ShaderHueTranslator.GetHueVector(ref _hueVector, 0, false, Alpha, true); int middleWidth = Width - _gumpTexture[0].Width - _gumpTexture[2].Width; batcher.Draw2D(_gumpTexture[0], x, y, ref _hueVector); diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/SystemChatControl.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/SystemChatControl.cs index e5108d9ab..fa2906df2 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/SystemChatControl.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/SystemChatControl.cs @@ -706,7 +706,7 @@ public void Update(double totalMS, double frameMS) public bool Draw(UltimaBatcher2D batcher, int x, int y) { - return _renderedText.Draw(batcher, x, y /*, ShaderHuesTraslator.GetHueVector(0, false, _alpha, true)*/); + return _renderedText.Draw(batcher, x, y /*, ShaderHueTranslator.GetHueVector(0, false, _alpha, true)*/); } public override string ToString() diff --git a/Assets/Scripts/ClassicUO/src/Renderer/Batcher2D.cs b/Assets/Scripts/ClassicUO/src/Renderer/Batcher2D.cs index bf2545990..d179e6f3c 100644 --- a/Assets/Scripts/ClassicUO/src/Renderer/Batcher2D.cs +++ b/Assets/Scripts/ClassicUO/src/Renderer/Batcher2D.cs @@ -541,7 +541,7 @@ public bool DrawSpriteShadow(Texture2D texture, int x, int y, bool flip) vertex.Hue0.Y = vertex.Hue1.Y = vertex.Hue2.Y = - vertex.Hue3.Y = ShaderHuesTraslator.SHADER_SHADOW; + vertex.Hue3.Y = ShaderHueTranslator.SHADER_SHADOW; PushSprite(texture); diff --git a/Assets/Scripts/ClassicUO/src/Renderer/RenderedText.cs b/Assets/Scripts/ClassicUO/src/Renderer/RenderedText.cs index 98addbe7d..106fa0c7c 100644 --- a/Assets/Scripts/ClassicUO/src/Renderer/RenderedText.cs +++ b/Assets/Scripts/ClassicUO/src/Renderer/RenderedText.cs @@ -358,11 +358,11 @@ public bool Draw(UltimaBatcher2D batcher, if (hue != 0) { if (IsUnicode) - _hueVector.Y = ShaderHuesTraslator.SHADER_TEXT_HUE_NO_BLACK; + _hueVector.Y = ShaderHueTranslator.SHADER_TEXT_HUE_NO_BLACK; else if (Font != 5 && Font != 8) - _hueVector.Y = ShaderHuesTraslator.SHADER_PARTIAL_HUED; + _hueVector.Y = ShaderHueTranslator.SHADER_PARTIAL_HUED; else - _hueVector.Y = ShaderHuesTraslator.SHADER_HUED; + _hueVector.Y = ShaderHueTranslator.SHADER_HUED; } else _hueVector.Y = 0; @@ -397,11 +397,11 @@ public bool Draw(UltimaBatcher2D batcher, int dx, int dy, int sx, int sy, int sw if (hue != 0) { if (IsUnicode) - _hueVector.Y = ShaderHuesTraslator.SHADER_TEXT_HUE_NO_BLACK; + _hueVector.Y = ShaderHueTranslator.SHADER_TEXT_HUE_NO_BLACK; else if (Font != 5 && Font != 8) - _hueVector.Y = ShaderHuesTraslator.SHADER_PARTIAL_HUED; + _hueVector.Y = ShaderHueTranslator.SHADER_PARTIAL_HUED; else - _hueVector.Y = ShaderHuesTraslator.SHADER_HUED; + _hueVector.Y = ShaderHueTranslator.SHADER_HUED; } else _hueVector.Y = 0; @@ -432,11 +432,11 @@ public bool Draw(UltimaBatcher2D batcher, int x, int y, float alpha = 0, ushort if (hue != 0) { if (IsUnicode) - _hueVector.Y = ShaderHuesTraslator.SHADER_TEXT_HUE_NO_BLACK; + _hueVector.Y = ShaderHueTranslator.SHADER_TEXT_HUE_NO_BLACK; else if (Font != 5 && Font != 8) - _hueVector.Y = ShaderHuesTraslator.SHADER_PARTIAL_HUED; + _hueVector.Y = ShaderHueTranslator.SHADER_PARTIAL_HUED; else - _hueVector.Y = ShaderHuesTraslator.SHADER_HUED; + _hueVector.Y = ShaderHueTranslator.SHADER_HUED; } else _hueVector.Y = 0; diff --git a/Assets/Scripts/ClassicUO/src/Renderer/ShaderHueTranslator.cs b/Assets/Scripts/ClassicUO/src/Renderer/ShaderHueTranslator.cs new file mode 120000 index 000000000..727dc35c8 --- /dev/null +++ b/Assets/Scripts/ClassicUO/src/Renderer/ShaderHueTranslator.cs @@ -0,0 +1 @@ +../../../../../external/ClassicUO/src/Renderer/ShaderHueTranslator.cs \ No newline at end of file diff --git a/Assets/Scripts/ClassicUO/src/Renderer/ShaderHuesTraslator.cs b/Assets/Scripts/ClassicUO/src/Renderer/ShaderHuesTraslator.cs deleted file mode 120000 index 5ad70957a..000000000 --- a/Assets/Scripts/ClassicUO/src/Renderer/ShaderHuesTraslator.cs +++ /dev/null @@ -1 +0,0 @@ -../../../../../external/ClassicUO/src/Renderer/ShaderHuesTraslator.cs \ No newline at end of file diff --git a/Assets/Scripts/ClassicUO/src/Utility/Exstentions.cs b/Assets/Scripts/ClassicUO/src/Utility/Extensions.cs similarity index 100% rename from Assets/Scripts/ClassicUO/src/Utility/Exstentions.cs rename to Assets/Scripts/ClassicUO/src/Utility/Extensions.cs diff --git a/Assets/Scripts/UnityBatcher.cs b/Assets/Scripts/UnityBatcher.cs index 4caf5d8bc..17a6b3bd7 100644 --- a/Assets/Scripts/UnityBatcher.cs +++ b/Assets/Scripts/UnityBatcher.cs @@ -497,7 +497,7 @@ public void DrawSpriteShadow(Texture2D texture, int x, int y, bool flip) vertex.Hue0.y = vertex.Hue1.y = vertex.Hue2.y = - vertex.Hue3.y = ShaderHuesTraslator.SHADER_SHADOW; + vertex.Hue3.y = ShaderHueTranslator.SHADER_SHADOW; RenderVertex(vertex, texture, vertex.Hue0); } diff --git a/external/ClassicUO b/external/ClassicUO index 072c3b2fc..f4992bdb4 160000 --- a/external/ClassicUO +++ b/external/ClassicUO @@ -1 +1 @@ -Subproject commit 072c3b2fcefa5eff3ab5bcd3ce928e3929302847 +Subproject commit f4992bdb4563043c0dab04f7bac2f0824b5ff390 From 9685a500ac186430038ea86b9c57ff7e6ced55e0 Mon Sep 17 00:00:00 2001 From: Bryan Denny Date: Mon, 23 Dec 2024 04:11:49 -0500 Subject: [PATCH 03/51] #24: rolling forward to 8/29/2020 CUO commit beb92539 --- Assets/Scripts/ClassicUO/src/CUOEnviroment.cs | 2 +- Assets/Scripts/ClassicUO/src/Client.cs | 4 +- .../ClassicUO/src/Configuration/Profile.cs | 2 +- .../Scripts/ClassicUO/src/Game/GameCursor.cs | 2 +- .../ClassicUO/src/Game/GameObjects/Land.cs | 14 +- .../Game/Managers/AnimatedStaticsManager.cs | 17 +- .../src/Game/Managers/AudioManager.cs | 12 +- .../ClassicUO/src/Game/Managers/UIManager.cs | 42 +-- .../ClassicUO/src/Game/Scenes/GameScene.cs | 34 +-- .../ClassicUO/src/Game/Scenes/LoginScene.cs | 10 +- .../ClassicUO/src/Game/UI/Controls/Control.cs | 2 +- .../src/Game/UI/Controls/HtmlControl.cs | 2 +- .../src/Game/UI/Controls/ItemGump.cs | 6 +- .../src/Game/UI/Controls/StbTextBox.cs | 2 +- .../src/Game/UI/Controls/WorldViewport.cs | 2 +- .../src/Game/UI/Gumps/Login/LoginGump.cs | 4 +- .../src/Game/UI/Gumps/ModernBookGump.cs | 2 +- .../ClassicUO/src/Game/UI/Gumps/ShopGump.cs | 28 +- .../src/Game/UI/Gumps/SystemChatControl.cs | 4 +- .../src/Game/UI/Gumps/WorldMapGump.cs | 62 ++-- Assets/Scripts/ClassicUO/src/Game/World.cs | 16 +- .../Scripts/ClassicUO/src/GameController.cs | 282 ++++++++++-------- .../src/IO/Resources/AnimDataLoader.cs | 18 +- .../src/IO/Resources/AnimationsLoader.cs | 56 ++-- .../ClassicUO/src/IO/Resources/ArtLoader.cs | 100 +++---- .../ClassicUO/src/IO/Resources/FontsLoader.cs | 35 +-- .../ClassicUO/src/IO/Resources/GumpsLoader.cs | 29 +- .../ClassicUO/src/IO/Resources/HuesLoader.cs | 17 +- .../src/IO/Resources/LightsLoader.cs | 23 +- .../ClassicUO/src/IO/Resources/MapLoader.cs | 47 ++- .../ClassicUO/src/IO/Resources/MultiLoader.cs | 19 +- .../src/IO/Resources/MultiMapLoader.cs | 22 +- .../src/IO/Resources/ProfessionLoader.cs | 17 +- .../src/IO/Resources/SkillsLoader.cs | 27 +- .../src/IO/Resources/SoundsLoader.cs | 185 ++++++------ .../src/IO/Resources/SpeechesLoader.cs | 15 +- .../src/IO/Resources/TexmapsLoader.cs | 42 +-- .../src/IO/Resources/TileDataLoader.cs | 60 ++-- Assets/Scripts/ClassicUO/src/IO/UOFile.cs | 15 +- .../Scripts/ClassicUO/src/IO/UOFileLoader.cs | 42 +-- .../Scripts/ClassicUO/src/Input/Keyboard.cs | 4 +- .../ClassicUO/src/Network/PacketHandlers.cs | 88 +++--- .../Scripts/ClassicUO/src/Network/Plugin.cs | 68 ++--- .../ClassicUO/src/Renderer/Batcher2D.cs | 30 +- .../ClassicUO/src/Renderer/Texture2DCache.cs | 2 +- external/ClassicUO | 2 +- 46 files changed, 691 insertions(+), 823 deletions(-) diff --git a/Assets/Scripts/ClassicUO/src/CUOEnviroment.cs b/Assets/Scripts/ClassicUO/src/CUOEnviroment.cs index 44da46212..3017b9b68 100644 --- a/Assets/Scripts/ClassicUO/src/CUOEnviroment.cs +++ b/Assets/Scripts/ClassicUO/src/CUOEnviroment.cs @@ -26,7 +26,7 @@ namespace ClassicUO { - static class CUOEnviroment + internal static class CUOEnviroment { public static Thread GameThread; public static float DPIScaleFactor = 1.0f; diff --git a/Assets/Scripts/ClassicUO/src/Client.cs b/Assets/Scripts/ClassicUO/src/Client.cs index 094a76418..3fed35373 100644 --- a/Assets/Scripts/ClassicUO/src/Client.cs +++ b/Assets/Scripts/ClassicUO/src/Client.cs @@ -39,7 +39,7 @@ namespace ClassicUO { - static class Client + internal static class Client { public static ClientVersion Version { get; private set; } public static ClientFlags Protocol { get; set; } @@ -171,7 +171,7 @@ public static void Load() Log.Trace("Loading plugins..."); - foreach (var p in Settings.GlobalSettings.Plugins) + foreach (string p in Settings.GlobalSettings.Plugins) Plugin.Create(p); Log.Trace("Done!"); diff --git a/Assets/Scripts/ClassicUO/src/Configuration/Profile.cs b/Assets/Scripts/ClassicUO/src/Configuration/Profile.cs index 8b011ccc1..46a89bb76 100644 --- a/Assets/Scripts/ClassicUO/src/Configuration/Profile.cs +++ b/Assets/Scripts/ClassicUO/src/Configuration/Profile.cs @@ -330,7 +330,7 @@ private void SaveGumps(string path, List gumps) for (int i = 0; i < gumps.Count; i++) { - var gump = gumps[i]; + Gump gump = gumps[i]; if (gump.IsDisposed) continue; diff --git a/Assets/Scripts/ClassicUO/src/Game/GameCursor.cs b/Assets/Scripts/ClassicUO/src/Game/GameCursor.cs index 694da1b9c..abbb0199e 100644 --- a/Assets/Scripts/ClassicUO/src/Game/GameCursor.cs +++ b/Assets/Scripts/ClassicUO/src/Game/GameCursor.cs @@ -375,7 +375,7 @@ public void Draw(UltimaBatcher2D sb) Array.Clear(_componentsList, 0, 10); - if (!World.CustomHouseManager.CanBuildHere(_componentsList, out var type)) + if (!World.CustomHouseManager.CanBuildHere(_componentsList, out CUSTOM_HOUSE_BUILD_TYPE type)) { hue = 0x0021; } diff --git a/Assets/Scripts/ClassicUO/src/Game/GameObjects/Land.cs b/Assets/Scripts/ClassicUO/src/Game/GameObjects/Land.cs index cb60fc512..8e31a5acc 100644 --- a/Assets/Scripts/ClassicUO/src/Game/GameObjects/Land.cs +++ b/Assets/Scripts/ClassicUO/src/Game/GameObjects/Land.cs @@ -178,7 +178,7 @@ public void ApplyStrech(int x, int y, sbyte z) { for (int k = 0; k < 4; k++) { - ref var v = ref _vectCache[curI, curJ, k]; + ref Vector3 v = ref _vectCache[curI, curJ, k]; v.X = 0; v.Y = 0; v.Z = 1; @@ -191,26 +191,26 @@ public void ApplyStrech(int x, int y, sbyte z) int half_2 = (rightZ - bottomZ) << 2; int half_3 = (bottomZ - leftZ) << 2; - ref var v0 = ref _vectCache[curI, curJ, 0]; + ref Vector3 v0 = ref _vectCache[curI, curJ, 0]; v0.X = -22; v0.Y = 22; v0.Z = half_0; MergeAndNormalize(ref v0, -22.0f, -22.0f, half_1); - ref var v1 = ref _vectCache[curI, curJ, 1]; + ref Vector3 v1 = ref _vectCache[curI, curJ, 1]; v1.X = 22; v1.Y = 22; v1.Z = half_2; MergeAndNormalize(ref v1, -22.0f, 22.0f, half_0); - ref var v2 = ref _vectCache[curI, curJ, 2]; + ref Vector3 v2 = ref _vectCache[curI, curJ, 2]; v2.X = 22; v2.Y = -22; v2.Z = half_3; MergeAndNormalize(ref v2, 22.0f, 22.0f, half_2); - ref var v3 = ref _vectCache[curI, curJ, 3]; + ref Vector3 v3 = ref _vectCache[curI, curJ, 3]; v3.X = -22; v3.Y = -22; v3.Z = half_1; @@ -270,8 +270,8 @@ private static void SumAndNormalize( int index3_x, int index3_y, int index3_z, out Vector3 result) { - Vector3.Add(ref vec[index0_x, index0_y, index0_z], ref vec[index1_x, index1_y, index1_z], out var v0Result); - Vector3.Add(ref vec[index2_x, index2_y, index2_z], ref vec[index3_x, index3_y, index3_z], out var v1Result); + Vector3.Add(ref vec[index0_x, index0_y, index0_z], ref vec[index1_x, index1_y, index1_z], out Vector3 v0Result); + Vector3.Add(ref vec[index2_x, index2_y, index2_z], ref vec[index3_x, index3_y, index3_z], out Vector3 v1Result); Vector3.Add(ref v0Result, ref v1Result, out result); Vector3.Normalize(ref result, out result); } diff --git a/Assets/Scripts/ClassicUO/src/Game/Managers/AnimatedStaticsManager.cs b/Assets/Scripts/ClassicUO/src/Game/Managers/AnimatedStaticsManager.cs index 3f0edcaec..a9ef83cdc 100644 --- a/Assets/Scripts/ClassicUO/src/Game/Managers/AnimatedStaticsManager.cs +++ b/Assets/Scripts/ClassicUO/src/Game/Managers/AnimatedStaticsManager.cs @@ -6,6 +6,7 @@ using ClassicUO.Configuration; using ClassicUO.Game.Data; +using ClassicUO.IO; using ClassicUO.IO.Resources; using ClassicUO.Utility.Collections; @@ -26,19 +27,19 @@ public static unsafe void Initialize() return; _static_infos = new RawList(); - var file = AnimDataLoader.Instance.AnimDataFile; + UOFile file = AnimDataLoader.Instance.AnimDataFile; if (file == null) return; - var startAddr = file.StartAddress.ToInt64(); + long startAddr = file.StartAddress.ToInt64(); uint lastaddr = (uint) (startAddr + file.Length - sizeof(AnimDataFrame2)); for (int i = 0; i < TileDataLoader.Instance.StaticData.Length; i++) { if (TileDataLoader.Instance.StaticData[i].IsAnimated) { - var addr = (uint) ((i * 68) + 4 * ((i / 8) + 1)); + uint addr = (uint) ((i * 68) + 4 * ((i / 8) + 1)); uint offset = (uint) (startAddr + addr); if (offset <= lastaddr) @@ -60,7 +61,7 @@ public static unsafe void Process() return; } - var file = AnimDataLoader.Instance.AnimDataFile; + UOFile file = AnimDataLoader.Instance.AnimDataFile; if (file == null) return; @@ -69,12 +70,12 @@ public static unsafe void Process() uint delay = Constants.ITEM_EFFECT_ANIMATION_DELAY * 2; uint next_time = Time.Ticks + 250; bool no_animated_field = ProfileManager.Current != null && ProfileManager.Current.FieldsType != 0; - var startAddr = file.StartAddress.ToInt64(); - var static_data = ArtLoader.Instance.Entries; + long startAddr = file.StartAddress.ToInt64(); + UOFileIndex[] static_data = ArtLoader.Instance.Entries; for (int i = 0; i < _static_infos.Count; i++) { - ref var o = ref _static_infos[i]; + ref static_animation_info o = ref _static_infos[i]; if (no_animated_field && o.is_field) { @@ -84,7 +85,7 @@ public static unsafe void Process() if (o.time < Time.Ticks) { - var addr = (uint) ((o.index * 68) + 4 * ((o.index / 8) + 1)); + uint addr = (uint) ((o.index * 68) + 4 * ((o.index / 8) + 1)); AnimDataFrame2* info = (AnimDataFrame2*) (startAddr + addr); byte offset = o.anim_index; diff --git a/Assets/Scripts/ClassicUO/src/Game/Managers/AudioManager.cs b/Assets/Scripts/ClassicUO/src/Game/Managers/AudioManager.cs index f025a24ea..7eafa6ae0 100644 --- a/Assets/Scripts/ClassicUO/src/Game/Managers/AudioManager.cs +++ b/Assets/Scripts/ClassicUO/src/Game/Managers/AudioManager.cs @@ -236,7 +236,7 @@ public void UpdateCurrentSoundsVolume() if (volume < -1 || volume > 1f) return; - for (var s = _current_sounds.First; s != null; s = s.Next) + for (LinkedListNode s = _current_sounds.First; s != null; s = s.Next) { s.Value.Volume = volume; } @@ -255,7 +255,7 @@ public void StopMusic() } //NOTE: Also discard sounds - foreach (var sound in _current_sounds) + foreach (UOSound sound in _current_sounds) { if (sound != null) { @@ -275,11 +275,11 @@ public void StopWarMusic() public void StopSounds() { - var first = _current_sounds.First; + LinkedListNode first = _current_sounds.First; while (first != null) { - var next = first.Next; + LinkedListNode next = first.Next; first.Value.Stop(); @@ -313,11 +313,11 @@ public void Update() } - var first = _current_sounds.First; + LinkedListNode first = _current_sounds.First; while (first != null) { - var next = first.Next; + LinkedListNode next = first.Next; if (!first.Value.IsPlaying) { diff --git a/Assets/Scripts/ClassicUO/src/Game/Managers/UIManager.cs b/Assets/Scripts/ClassicUO/src/Game/Managers/UIManager.cs index 3d1dd2d05..276ee6c7e 100644 --- a/Assets/Scripts/ClassicUO/src/Game/Managers/UIManager.cs +++ b/Assets/Scripts/ClassicUO/src/Game/Managers/UIManager.cs @@ -420,7 +420,7 @@ public static void OnMouseWheel(bool isup) public static bool HadMouseDownOnGump(MouseButtonType button) { - var c = LastControlMouseDown(button); + Control c = LastControlMouseDown(button); return c != null && !c.IsDisposed && !(c is WorldViewport) && !ItemHold.Enabled; } @@ -468,9 +468,9 @@ public static T GetGump(uint? serial = null) where T : Control { if (serial.HasValue) { - for (var last = Gumps.Last; last != null; last = last.Previous) + for (LinkedListNode last = Gumps.Last; last != null; last = last.Previous) { - var c = last.Value; + Control c = last.Value; if (!c.IsDisposed && c.LocalSerial == serial.Value && c is T t) return t; @@ -478,9 +478,9 @@ public static T GetGump(uint? serial = null) where T : Control } else { - for (var first = Gumps.First; first != null; first = first.Next) + for (LinkedListNode first = Gumps.First; first != null; first = first.Next) { - var c = first.Value; + Control c = first.Value; if (!c.IsDisposed && c is T t) return t; @@ -491,9 +491,9 @@ public static T GetGump(uint? serial = null) where T : Control public static Gump GetGump(uint serial) { - for (var last = Gumps.Last; last != null; last = last.Previous) + for (LinkedListNode last = Gumps.Last; last != null; last = last.Previous) { - var c = last.Value; + Control c = last.Value; if (!c.IsDisposed && c.LocalSerial == serial) return c as Gump; @@ -504,7 +504,7 @@ public static Gump GetGump(uint serial) public static TradingGump GetTradingGump(uint serial) { - for (var g = Gumps.Last; g != null; g = g.Previous) + for (LinkedListNode g = Gumps.Last; g != null; g = g.Previous) { if (g.Value != null && !g.Value.IsDisposed && g.Value is TradingGump trading && (trading.ID1 == serial || trading.ID2 == serial || trading.LocalSerial == serial)) { @@ -519,11 +519,11 @@ public static void Update(double totalMS, double frameMS) { SortControlsByInfo(); - var first = Gumps.First; + LinkedListNode first = Gumps.First; while (first != null) { - var next = first.Next; + LinkedListNode next = first.Next; Control g = first.Value; @@ -548,9 +548,9 @@ public static void Draw(UltimaBatcher2D batcher) batcher.Begin(); - for (var last = Gumps.Last; last != null; last = last.Previous) + for (LinkedListNode last = Gumps.Last; last != null; last = last.Previous) { - var g = last.Value; + Control g = last.Value; g.Draw(batcher, g.X, g.Y); } @@ -614,9 +614,9 @@ private static void HandleKeyboardInput() } else { - for (var first = Gumps.First; first != null; first = first.Next) + for (LinkedListNode first = Gumps.First; first != null; first = first.Next) { - var c = first.Value; + Control c = first.Value; if (!c.IsDisposed && c.IsVisible && c.IsEnabled) { @@ -682,9 +682,9 @@ public static Control GetMouseOverControl(Point position) bool ismodal = IsModalControlOpen(); - for (var first = Gumps.First; first != null; first = first.Next) + for (LinkedListNode first = Gumps.First; first != null; first = first.Next) { - var c = first.Value; + Control c = first.Value; if ((ismodal && !c.ControlInfo.IsModal) || !c.IsVisible || !c.IsEnabled) { @@ -709,7 +709,7 @@ public static void MakeTopMostGump(Control control) while (c.Parent != null) c = c.Parent; - var first = Gumps.First?.Next; // skip game window + LinkedListNode first = Gumps.First?.Next; // skip game window for (; first != null; first = first.Next) { @@ -726,16 +726,16 @@ private static void SortControlsByInfo() { if (_needSort) { - for (var el = Gumps.First; el != null; el = el.Next) + for (LinkedListNode el = Gumps.First; el != null; el = el.Next) { - var c = el.Value; + Control c = el.Value; if (c.ControlInfo.Layer == UILayer.Default) continue; if (c.ControlInfo.Layer == UILayer.Under) { - for (var first = Gumps.First; first != null; first = first.Next) + for (LinkedListNode first = Gumps.First; first != null; first = first.Next) { if (first.Value == c) { @@ -749,7 +749,7 @@ private static void SortControlsByInfo() } else if (c.ControlInfo.Layer == UILayer.Over) { - for (var first = Gumps.First; first != null; first = first.Next) + for (LinkedListNode first = Gumps.First; first != null; first = first.Next) { if (first.Value == c) { diff --git a/Assets/Scripts/ClassicUO/src/Game/Scenes/GameScene.cs b/Assets/Scripts/ClassicUO/src/Game/Scenes/GameScene.cs index 76e4f204e..aaa9b6532 100644 --- a/Assets/Scripts/ClassicUO/src/Game/Scenes/GameScene.cs +++ b/Assets/Scripts/ClassicUO/src/Game/Scenes/GameScene.cs @@ -369,7 +369,7 @@ public void AddLight(GameObject obj, GameObject lightObject, int x, int y) int testX = obj.X + 1; int testY = obj.Y + 1; - var tile = World.Map.GetTile(testX, testY); + GameObject tile = World.Map.GetTile(testX, testY); if (tile != null) { @@ -393,7 +393,7 @@ public void AddLight(GameObject obj, GameObject lightObject, int x, int y) if (canBeAdded) { - ref var light = ref _lights[_lightCount]; + ref LightData light = ref _lights[_lightCount]; ushort graphic = lightObject.Graphic; @@ -411,7 +411,7 @@ public void AddLight(GameObject obj, GameObject lightObject, int x, int y) light.ID = 1; else { - ref var data = ref TileDataLoader.Instance.StaticData[obj.Graphic]; + ref StaticTiles data = ref TileDataLoader.Instance.StaticData[obj.Graphic]; light.ID = data.Layer; } } @@ -466,8 +466,8 @@ private void FillGameObjectList() int minY = _minTile.Y; int maxX = _maxTile.X; int maxY = _maxTile.Y; - var map = World.Map; - var use_handles = _useObjectHandles; + Map.Map map = World.Map; + bool use_handles = _useObjectHandles; for (int i = 0; i < 2; ++i) { @@ -505,7 +505,7 @@ private void FillGameObjectList() { for (int i = 0; i < _foliageCount; i++) { - var f = _foliages[i]; + GameObject f = _foliages[i]; if (f.FoliageIndex == _foliageIndex) { @@ -549,7 +549,7 @@ public override void Update(double totalMS, double frameMS) if (_forceStopScene) { - var loginScene = new LoginScene(); + LoginScene loginScene = new LoginScene(); Client.Game.SetScene(loginScene); loginScene.Reconnect = true; @@ -633,12 +633,12 @@ public override void Update(double totalMS, double frameMS) if (TargetManager.IsTargeting && TargetManager.TargetingState == CursorTarget.MultiPlacement && World.CustomHouseManager == null && TargetManager.MultiTargetInfo != null) { if (_multi == null) - _multi = new Item() - { - Graphic = TargetManager.MultiTargetInfo.Model, - Hue = TargetManager.MultiTargetInfo.Hue, - IsMulti = true, - }; + { + _multi = Item.Create(0); + _multi.Graphic = TargetManager.MultiTargetInfo.Model; + _multi.Hue = TargetManager.MultiTargetInfo.Hue; + _multi.IsMulti = true; + } if (SelectedObject.Object is GameObject gobj) { @@ -648,7 +648,7 @@ public override void Update(double totalMS, double frameMS) int cellX = gobj.X % 8; int cellY = gobj.Y % 8; - var o = World.Map.GetChunk(gobj.X, gobj.Y)?.Tiles[cellX, cellY]; + GameObject o = World.Map.GetChunk(gobj.X, gobj.Y)?.Tiles[cellX, cellY]; if (o != null) { x = o.X; @@ -677,7 +677,7 @@ public override void Update(double totalMS, double frameMS) _multi.UpdateScreenPosition(); _multi.CheckGraphicChange(); _multi.AddToTile(); - World.HouseManager.TryGetHouse(_multi.Serial, out var house); + World.HouseManager.TryGetHouse(_multi.Serial, out House house); foreach (Multi s in house.Components) { @@ -846,7 +846,7 @@ private void DrawLights(UltimaBatcher2D batcher) if (!UseAltLights) { - var lightColor = World.Light.IsometricLevel; + float lightColor = World.Light.IsometricLevel; if (ProfileManager.Current.UseDarkNights) lightColor -= 0.04f; @@ -865,7 +865,7 @@ private void DrawLights(UltimaBatcher2D batcher) for (int i = 0; i < _lightCount; i++) { - ref var l = ref _lights[i]; + ref LightData l = ref _lights[i]; UOTexture32 texture = LightsLoader.Instance.GetTexture(l.ID); if (texture == null) diff --git a/Assets/Scripts/ClassicUO/src/Game/Scenes/LoginScene.cs b/Assets/Scripts/ClassicUO/src/Game/Scenes/LoginScene.cs index eea336288..753fcd7bc 100644 --- a/Assets/Scripts/ClassicUO/src/Game/Scenes/LoginScene.cs +++ b/Assets/Scripts/ClassicUO/src/Game/Scenes/LoginScene.cs @@ -163,7 +163,7 @@ public override void Update(double totalMS, double frameMS) UIManager.GameCursor.IsLoading = false; // this trick avoid the flickering - var g = _currentGump; + Gump g = _currentGump; UIManager.Add(_currentGump = GetGumpForStep()); g.Dispose(); @@ -206,7 +206,7 @@ public override void Update(double totalMS, double frameMS) private Gump GetGumpForStep() { - foreach (var item in World.Items) + foreach (Item item in World.Items) World.RemoveItem(item); foreach (Mobile mobile in World.Mobiles) @@ -250,8 +250,8 @@ private Gump GetGumpForStep() private LoadingGump GetLoadingScreen() { - var labelText = "No Text"; - var showButtons = LoginButtons.None; + string labelText = "No Text"; + LoginButtons showButtons = LoginButtons.None; if (!string.IsNullOrEmpty(PopupMessage)) { @@ -665,7 +665,7 @@ private void ParseCharacterList(Packet p) private void ParseCities(Packet p) { - var count = p.ReadByte(); + byte count = p.ReadByte(); Cities = new CityInfo[count]; bool isNew = Client.Version >= ClientVersion.CV_70130; diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/Control.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/Control.cs index 84ddef515..ec54bafb6 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/Control.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/Control.cs @@ -559,7 +559,7 @@ public bool InvokeMouseDoubleClick(Point position, MouseButtonType button) int y = position.Y - Y - ParentY; bool result = OnMouseDoubleClick(x, y, button); - var arg = new MouseDoubleClickEventArgs(x, y, button); + MouseDoubleClickEventArgs arg = new MouseDoubleClickEventArgs(x, y, button); MouseDoubleClick.Raise(arg, this); result |= arg.Result; diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/HtmlControl.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/HtmlControl.cs index 9337a5161..14f9ecc0c 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/HtmlControl.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/HtmlControl.cs @@ -251,7 +251,7 @@ protected override void OnMouseUp(int x, int y, MouseButtonType button) { for (int i = 0; i < _gameText.Links.Count; i++) { - ref var link = ref _gameText.Links[i]; + ref WebLinkRect link = ref _gameText.Links[i]; bool inbounds = link.Bounds.Contains(x, (_scrollBar == null ? 0 : _scrollBar.Value) + y); diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/ItemGump.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/ItemGump.cs index 9a3c2b3f8..8f7243d4c 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/ItemGump.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/ItemGump.cs @@ -90,7 +90,7 @@ public override bool Draw(UltimaBatcher2D batcher, int x, int y) ResetHueVector(); ShaderHueTranslator.GetHueVector(ref _hueVector, HighlightOnMouseOver && MouseIsOver ? 0x0035 : Hue, IsPartialHue, 0, false); - var texture = ArtLoader.Instance.GetTexture(Graphic); + ArtTexture texture = ArtLoader.Instance.GetTexture(Graphic); if (texture != null) { @@ -109,7 +109,7 @@ public override bool Draw(UltimaBatcher2D batcher, int x, int y) public override bool Contains(int x, int y) { - var texture = ArtLoader.Instance.GetTexture(Graphic); + ArtTexture texture = ArtLoader.Instance.GetTexture(Graphic); if (texture == null) { @@ -160,7 +160,7 @@ private bool CanPickup() Math.Abs(offset.Y) < Constants.MIN_PICKUP_DRAG_DISTANCE_PIXELS) return false; - var split = UIManager.GetGump(LocalSerial); + SplitMenuGump split = UIManager.GetGump(LocalSerial); if (split == null) return true; diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs index c4c0f8d9e..f9405d2f4 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/StbTextBox.cs @@ -830,7 +830,7 @@ internal int TotalHeight get { int h = 20; - var info = GetInfo(); + MultilinesFontInfo info = GetInfo(); while (info != null) { h += info.MaxHeight; diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/WorldViewport.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/WorldViewport.cs index 3b46a61ca..5dec33e99 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Controls/WorldViewport.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Controls/WorldViewport.cs @@ -139,7 +139,7 @@ protected override void OnMouseUp(int x, int y, MouseButtonType button) { if (!UIManager.IsMouseOverWorld && UIManager.MouseOverControl != null) { - var p = UIManager.MouseOverControl.GetFirstControlAcceptKeyboardInput(); + Control p = UIManager.MouseOverControl.GetFirstControlAcceptKeyboardInput(); p?.SetKeyboardFocus(); } else diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/Login/LoginGump.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/Login/LoginGump.cs index 90b342324..b6602fce2 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/Login/LoginGump.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/Login/LoginGump.cs @@ -283,7 +283,7 @@ public LoginGump(LoginScene scene) : base(0, 0) - var loginmusic_checkbox = new Checkbox(0x00D2, 0x00D3, "Music", font, hue, false) + Checkbox loginmusic_checkbox = new Checkbox(0x00D2, 0x00D3, "Music", font, hue, false) { X = _checkboxSaveAccount.X + _checkboxSaveAccount.Width + 10, Y = 417, @@ -291,7 +291,7 @@ public LoginGump(LoginScene scene) : base(0, 0) }; Add(loginmusic_checkbox); - var login_music = new HSliderBar(loginmusic_checkbox.X + loginmusic_checkbox.Width + 10, loginmusic_checkbox.Y + 4, 80, 0, 100, Settings.GlobalSettings.LoginMusicVolume, HSliderBarStyle.MetalWidgetRecessedBar, true, font, hue, unicode: false); + HSliderBar login_music = new HSliderBar(loginmusic_checkbox.X + loginmusic_checkbox.Width + 10, loginmusic_checkbox.Y + 4, 80, 0, 100, Settings.GlobalSettings.LoginMusicVolume, HSliderBarStyle.MetalWidgetRecessedBar, true, font, hue, unicode: false); Add(login_music); login_music.IsVisible = Settings.GlobalSettings.LoginMusic; diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ModernBookGump.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ModernBookGump.cs index 32dbf1470..de7a84267 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ModernBookGump.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ModernBookGump.cs @@ -278,7 +278,7 @@ public override bool Draw(UltimaBatcher2D batcher, int x, int y) if (ScissorStack.PushScissors(batcher.GraphicsDevice, scissor)) { batcher.EnableScissorTest(true); - var t = _bookPage.renderedText; + RenderedText t = _bookPage.renderedText; int startpage = (ActivePage - 1) * 2; if (startpage < BookPageCount) { diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ShopGump.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ShopGump.cs index 8bde77d6a..f277d67da 100644 --- a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ShopGump.cs +++ b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/ShopGump.cs @@ -86,7 +86,7 @@ public ShopGump(uint serial, bool isBuyGump, int x, int y) : base(serial, 0) //6 }; Add(_middleGumpLeft); - var left_down = new GumpPicTexture(0, _middleGumpLeft.Height + _middleGumpLeft.Y, _shopGumpParts[2 + add]); + GumpPicTexture left_down = new GumpPicTexture(0, _middleGumpLeft.Height + _middleGumpLeft.Y, _shopGumpParts[2 + add]); Add(left_down); _shopScrollArea = new ScrollArea(30, 60, 225, _middleGumpLeft.Height + _middleGumpLeft.Y + 50, false, _middleGumpLeft.Height + _middleGumpLeft.Y); @@ -101,7 +101,7 @@ public ShopGump(uint serial, bool isBuyGump, int x, int y) : base(serial, 0) //6 Add(_middleGumpRight); - var right_down = new GumpPicTexture(250, _middleGumpRight.Height + _middleGumpRight.Y, _shopGumpParts[5 + add]); + GumpPicTexture right_down = new GumpPicTexture(250, _middleGumpRight.Height + _middleGumpRight.Y, _shopGumpParts[5 + add]); Add(right_down); @@ -255,7 +255,7 @@ public ShopGump(uint serial, bool isBuyGump, int x, int y) : base(serial, 0) //6 private void GenerateVirtualTextures() { _shopGumpParts = new UOTexture32[12]; - var t = GumpsLoader.Instance.GetTexture(0x0870, true); + UOTexture32 t = GumpsLoader.Instance.GetTexture(0x0870, true); UOTexture32[][] splits = new UOTexture32[4][]; splits[0] = Utility.GraphicHelper.SplitTexture16(t, @@ -373,7 +373,7 @@ public override void Update(double totalMS, double frameMS) { int sum = 0; - foreach (var t in _transactionItems.Values) + foreach (TransactionItem t in _transactionItems.Values) { sum += t.Amount * t.Price; } @@ -394,7 +394,7 @@ public override bool Draw(UltimaBatcher2D batcher, int x, int y) private void ShopItem_MouseDoubleClick(object sender, MouseDoubleClickEventArgs e) { - var shopItem = (ShopItem) sender; + ShopItem shopItem = (ShopItem) sender; if (shopItem.Amount <= 0) return; @@ -419,7 +419,7 @@ private void ShopItem_MouseDoubleClick(object sender, MouseDoubleClickEventArgs private void TransactionItem_OnDecreaseButtomClicked(object sender, EventArgs e) { - var transactionItem = (TransactionItem) sender; + TransactionItem transactionItem = (TransactionItem) sender; int total = _shiftPressed ? transactionItem.Amount : 1; @@ -446,7 +446,7 @@ private void RemoveTransactionItem(TransactionItem transactionItem) private void TransactionItem_OnIncreaseButtomClicked(object sender, EventArgs e) { - var transactionItem = (TransactionItem) sender; + TransactionItem transactionItem = (TransactionItem) sender; if (_shopItems[transactionItem.LocalSerial].Amount > 0) { @@ -459,7 +459,7 @@ private void TransactionItem_OnIncreaseButtomClicked(object sender, EventArgs e) private void ShopItem_MouseClick(object sender, MouseEventArgs e) { - foreach (var shopItem in _shopScrollArea.Children.SelectMany(o => o.Children).OfType()) + foreach (ShopItem shopItem in _shopScrollArea.Children.SelectMany(o => o.Children).OfType()) shopItem.IsSelected = shopItem == sender; } @@ -468,7 +468,7 @@ public override void OnButtonClick(int buttonID) switch ((Buttons) buttonID) { case Buttons.Accept: - var items = _transactionItems.Select(t => new Tuple(t.Key, (ushort) t.Value.Amount)).ToArray(); + Tuple[] items = _transactionItems.Select(t => new Tuple(t.Key, (ushort) t.Value.Amount)).ToArray(); if (IsBuyGump) NetClient.Socket.Send(new PBuyRequest(LocalSerial, items)); @@ -481,7 +481,7 @@ public override void OnButtonClick(int buttonID) case Buttons.Clear: - foreach (var t in _transactionItems.Values.ToList()) + foreach (TransactionItem t in _transactionItems.Values.ToList()) RemoveTransactionItem(t); break; @@ -523,7 +523,7 @@ private static AnimationDirection GetMobileAnimationDirection(ushort graphic, re } byte group = GetAnimGroup(graphic); - var index = AnimationsLoader.Instance.DataIndex[graphic]; + IndexAnimation index = AnimationsLoader.Instance.DataIndex[graphic]; AnimationDirection direction = index.Groups[group].Direction[dirIndex]; AnimationsLoader.Instance.AnimID = graphic; @@ -595,7 +595,7 @@ public ShopItem(uint serial, ushort graphic, ushort hue, int count, uint price, } else if (SerialHelper.IsItem(LocalSerial)) { - var texture = ArtLoader.Instance.GetTexture(Graphic); + ArtTexture texture = ArtLoader.Instance.GetTexture(Graphic); Add(control = new TextureControl { @@ -654,7 +654,7 @@ public bool IsSelected { set { - foreach (var label in Children.OfType