Skip to content

Commit 20a8180

Browse files
cleanup inventory window/item (#2631)
* rename shop window * starting cleaning inventory window/item * remove unused things * solve merge conflicts * dont show item data when dragging
1 parent cd19ff2 commit 20a8180

File tree

5 files changed

+472
-479
lines changed

5 files changed

+472
-479
lines changed

Intersect.Client.Core/Interface/Game/GameInterface.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public partial class GameInterface : MutableInterface
4747

4848
private QuestOfferWindow mQuestOfferWindow;
4949

50-
private ShopWindow mShopWindow;
50+
private ShopWindow _shopWindow;
5151

5252
private MapItemWindow mMapItemWindow;
5353

@@ -210,7 +210,7 @@ public void NotifyCloseShop()
210210

211211
public void OpenShop()
212212
{
213-
mShopWindow = new ShopWindow(GameCanvas) { DeleteOnClose = true };
213+
_shopWindow = new ShopWindow(GameCanvas) { DeleteOnClose = true };
214214
mShouldOpenShop = false;
215215
}
216216

@@ -391,7 +391,7 @@ public void Update(TimeSpan elapsed, TimeSpan total)
391391
GameMenu.OpenInventory();
392392
}
393393

394-
if (mShopWindow != null && (!mShopWindow.IsVisibleInTree || mShouldCloseShop))
394+
if (_shopWindow != null && (!_shopWindow.IsVisibleInTree || mShouldCloseShop))
395395
{
396396
CloseShop();
397397
}
@@ -520,8 +520,8 @@ public void Draw(TimeSpan elapsed, TimeSpan total)
520520
private void CloseShop()
521521
{
522522
Globals.GameShop = null;
523-
mShopWindow?.Hide();
524-
mShopWindow = null;
523+
_shopWindow?.Hide();
524+
_shopWindow = null;
525525
PacketSender.SendCloseShop();
526526
}
527527

@@ -584,7 +584,7 @@ public bool CloseAllWindows()
584584
closedWindows = true;
585585
}
586586

587-
if (mShopWindow is { IsVisibleInTree: true })
587+
if (_shopWindow is { IsVisibleInTree: true })
588588
{
589589
CloseShop();
590590
closedWindows = true;

0 commit comments

Comments
 (0)