Skip to content

cleanup inventory window/item #2631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pandinocoder merged 5 commits into from
Feb 27, 2025
Merged

cleanup inventory window/item #2631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
23b4ad7
rename shop window
WeylonSantana Feb 27, 2025
eeb0d4b
starting cleaning inventory window/item
WeylonSantana Feb 27, 2025
7acc3e4
remove unused things
WeylonSantana Feb 27, 2025
80ffd8c
solve merge conflicts
WeylonSantana Feb 27, 2025
1cc5f55
dont show item data when dragging
WeylonSantana Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Intersect.Client.Core/Interface/Game/GameInterface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public partial class GameInterface : MutableInterface

private QuestOfferWindow mQuestOfferWindow;

private ShopWindow mShopWindow;
private ShopWindow _shopWindow;

private MapItemWindow mMapItemWindow;

Expand Down Expand Up @@ -210,7 +210,7 @@ public void NotifyCloseShop()

public void OpenShop()
{
mShopWindow = new ShopWindow(GameCanvas) { DeleteOnClose = true };
_shopWindow = new ShopWindow(GameCanvas) { DeleteOnClose = true };
mShouldOpenShop = false;
}

Expand Down Expand Up @@ -391,7 +391,7 @@ public void Update(TimeSpan elapsed, TimeSpan total)
GameMenu.OpenInventory();
}

if (mShopWindow != null && (!mShopWindow.IsVisibleInTree || mShouldCloseShop))
if (_shopWindow != null && (!_shopWindow.IsVisibleInTree || mShouldCloseShop))
{
CloseShop();
}
Expand Down Expand Up @@ -520,8 +520,8 @@ public void Draw(TimeSpan elapsed, TimeSpan total)
private void CloseShop()
{
Globals.GameShop = null;
mShopWindow?.Hide();
mShopWindow = null;
_shopWindow?.Hide();
_shopWindow = null;
PacketSender.SendCloseShop();
}

Expand Down Expand Up @@ -584,7 +584,7 @@ public bool CloseAllWindows()
closedWindows = true;
}

if (mShopWindow is { IsVisibleInTree: true })
if (_shopWindow is { IsVisibleInTree: true })
{
CloseShop();
closedWindows = true;
Expand Down
Loading
Loading