Skip to content

Commit

Permalink
migratye
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeannsebold6666
jeannsebold6666 committed Jun 7, 2024
1 parent 519cbf7 commit 6054be7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/ClassicUO.Assets/ArtLoader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ public Texture2D GetStaticTexture(uint g, out Rectangle bounds)
}


public unsafe IntPtr CreateCursorSurfacePtr(int index, ushort customHue, out int hotX, out int hotY)
private unsafe IntPtr CreateCursorSurfacePtr(int index, ushort customHue, out int hotX, out int hotY)

Check failure on line 318 in src/ClassicUO.Assets/ArtLoader.cs

View workflow job for this annotation

GitHub Actions / build (macos-latest) 

The modifier 'private' is not valid for this item

Check failure on line 318 in src/ClassicUO.Assets/ArtLoader.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

The modifier 'private' is not valid for this item
{
hotX = hotY = 0;

Expand Down
4 changes: 2 additions & 2 deletions src/ClassicUO.Assets/GumpsLoader.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public unsafe GumpInfo GetGump(uint index)



public bool PixelCheck(int index, int x, int y)
bool PixelCheck(int index, int x, int y)
{
return new GumpInfo()
{
Expand All @@ -272,7 +272,7 @@ public bool PixelCheck(int index, int x, int y)
};
}

[StructLayout(LayoutKind.Sequential, Pack = 1)]
[StructLayout(LayoutKind.Sequential, Pack = 1)];

Check failure on line 275 in src/ClassicUO.Assets/GumpsLoader.cs

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest) 

} expected
private ref struct GumpBlock
{
public readonly ushort Value;
Expand Down
24 changes: 12 additions & 12 deletions src/ClassicUO.Client/Game/UI/Gumps/GridContainer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,9 @@ public GridContainer(uint local, ushort ogContainer) : base(GetWidth(), GetHeigh
{
if (e.Button == MouseButtonType.Left && _quickDropBackpack.MouseIsOver)
{
if (Client.Game.GameCursor.ItemHold.Enabled)
if (Client.Game.UO.GameCursor.ItemHold.Enabled)
{
GameActions.DropItem(Client.Game.GameCursor.ItemHold.Serial, 0xFFFF, 0xFFFF, 0, World.Player.FindItemByLayer(Layer.Backpack));
GameActions.DropItem(Client.Game.UO.GameCursor.ItemHold.Serial, 0xFFFF, 0xFFFF, 0, World.Player.FindItemByLayer(Layer.Backpack));
RequestUpdateContents();
}
}
Expand All @@ -176,7 +176,7 @@ public GridContainer(uint local, ushort ogContainer) : base(GetWidth(), GetHeigh
};
_quickDropBackpack.MouseEnter += (sender, e) =>
{
if (Client.Game.GameCursor.ItemHold.Enabled) _quickDropBackpack.Graphic = quickDropIcon == null ? (ushort)1210 : (ushort)1626;
if (Client.Game.UO.GameCursor.ItemHold.Enabled) _quickDropBackpack.Graphic = quickDropIcon == null ? (ushort)1210 : (ushort)1626;
};
_quickDropBackpack.MouseExit += (sender, e) => { _quickDropBackpack.Graphic = quickDropIcon == null ? (ushort)1209 : (ushort)1625; };
_quickDropBackpack.SetTooltip("Drop an item here to send it to your backpack.");
Expand Down Expand Up @@ -695,11 +695,11 @@ private void _hit_MouseDoubleClick(object sender, MouseDoubleClickEventArgs e)
}
if (!Keyboard.Ctrl && ProfileManager.CurrentProfile.DoubleClickToLootInsideContainers && _item != null && !_item.IsDestroyed && !_item.ItemData.IsContainer && container != World.Player.FindItemByLayer(Layer.Backpack) && !_item.IsLocked && _item.IsLootable)
{
GameActions.GrabItem(_item, _item.Amount);
_world.GameActions.GrabItem(_item, _item.Amount);
}
else
{
GameActions.DoubleClick(LocalSerial);
_world.GameActions.DoubleClick(LocalSerial);
}
e.Result = true;
}
Expand All @@ -708,22 +708,22 @@ private void _hit_MouseUp(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtonType.Left)
{
if (Client.Game.GameCursor.ItemHold.Enabled)
if (Client.Game.UO.GameCursor.ItemHold.Enabled)
{
if (_item != null && _item.ItemData.IsContainer)
{
Rectangle containerBounds = ContainerManager.Get(_item.Graphic).Bounds;
GameActions.DropItem(Client.Game.GameCursor.ItemHold.Serial, containerBounds.X / 2, containerBounds.Y / 2, 0, _item.Serial);
GameActions.DropItem(Client.Game.UO.GameCursor.ItemHold.Serial, containerBounds.X / 2, containerBounds.Y / 2, 0, _item.Serial);
}
else if (_item != null && _item.ItemData.IsStackable && _item.Graphic == Client.Game.GameCursor.ItemHold.Graphic)
else if (_item != null && _item.ItemData.IsStackable && _item.Graphic == Client.Game.UO.GameCursor.ItemHold.Graphic)
{
GameActions.DropItem(Client.Game.GameCursor.ItemHold.Serial, _item.X, _item.Y, 0, _item.Serial);
GameActions.DropItem(Client.Game.UO.GameCursor.ItemHold.Serial, _item.X, _item.Y, 0, _item.Serial);
}
else
{
Rectangle containerBounds = ContainerManager.Get(container.Graphic).Bounds;
gridContainer.gridSlotManager.AddLockedItemSlot(Client.Game.GameCursor.ItemHold.Serial, slot);
GameActions.DropItem(Client.Game.GameCursor.ItemHold.Serial, containerBounds.X / 2, containerBounds.Y / 2, 0, container.Serial);
gridContainer.gridSlotManager.AddLockedItemSlotClient.Game.UO.GameCursor.ItemHold.Serial, slot);
GameActions.DropItem(Client.Game.UO.GameCursor.ItemHold.Serial, containerBounds.X / 2, containerBounds.Y / 2, 0, container.Serial);
}
}
else if (TargetManager.IsTargeting)
Expand Down Expand Up @@ -1070,7 +1070,7 @@ public List<Item> SearchResults(string search)
filteredContents.Add(i);
continue;
}
if (World.OPL.TryGetNameAndData(i.Serial, out string name, out string data))
if (_world.OPL.TryGetNameAndData(i.Serial, out string name, out string data))
{
if (data != null)
if (data.ToLower().Contains(search.ToLower()))
Expand Down

0 comments on commit 6054be7

Please sign in to comment.