Fix for wrong world map colors and not being able to resize world map…

… gump
VoxelBoy · Jun 18, 2020 · 9f66728 · 9f66728
1 parent 3ac1404
commit 9f66728
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/WorldMapGump.cs b/Assets/Scripts/ClassicUO/src/Game/UI/Gumps/WorldMapGump.cs
@@ -569,7 +569,7 @@ bool IsNoDrawable(ushort g)
                                     if (b > 255)
                                         b = 255;
 
-                                    cc.PackedValue = (uint)(A << 24) + (uint)(R << 16) + (uint)(G << 8) + B;
+                                    cc.PackedValue = (uint)(A << 24) + (uint)((byte)r << 16) + (uint)((byte)g << 8) + (byte)b;
                                 }
                             }
                         }

diff --git a/Assets/Scripts/ClassicUO/src/GameController.cs b/Assets/Scripts/ClassicUO/src/GameController.cs
@@ -353,10 +353,10 @@ protected override void Update(GameTime gameTime)
                 _scene.Update(gameTime.TotalGameTime.TotalMilliseconds, gameTime.ElapsedGameTime.TotalMilliseconds);
                 Profiler.ExitContext("Update");
             }
-
-            UIManager.Update(gameTime.TotalGameTime.TotalMilliseconds, gameTime.ElapsedGameTime.TotalMilliseconds);
 
             UnityInputUpdate();
+
+            UIManager.Update(gameTime.TotalGameTime.TotalMilliseconds, gameTime.ElapsedGameTime.TotalMilliseconds);
 
             _totalElapsed += gameTime.ElapsedGameTime.TotalMilliseconds;
             _currentFpsTime += gameTime.ElapsedGameTime.TotalMilliseconds;

diff --git a/Assets/Scripts/XNAEmulator/Graphics/Texture2D.cs b/Assets/Scripts/XNAEmulator/Graphics/Texture2D.cs
@@ -181,20 +181,6 @@ internal void SetData(uint[] data, int startOffset = 0, int elementCount = 0, bo
 
             Hash = UnityTexture.GetHashCode();
         }
-
-        public static void TextureDataFromStreamEXT(
-            Stream stream,
-            out int width,
-            out int height,
-            out byte[] pixels,
-            int requestedWidth = -1,
-            int requestedHeight = -1,
-            bool zoom = false)
-        {
-            width = requestedWidth;
-            height = requestedHeight;
-            pixels = new[] {(byte)0};
-        }
 
         public override int GetHashCode()
         {