Skip to content

Push inventory window directly instead of through message queue #2756

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Push inventory window directly instead of through message queue #2756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8474718
Push inventory window directly instead of through message queue
TwelveEyes Jun 13, 2025
bd5ce16
Fix yes selection for dungeon wagon access prompt
TwelveEyes Jun 19, 2025
07a242c
Revert change to knightly order and wagon prompt
TwelveEyes Jun 19, 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
5 changes: 3 additions & 2 deletions Assets/Scripts/Game/PlayerActivate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,7 +957,7 @@ void ActivateLootContainer(RaycastHit hit, DaggerfallLoot loot)
}
// Open inventory window with activated loot container as remote target (if we fall through to here)
DaggerfallUI.Instance.InventoryWindow.LootTarget = loot;
DaggerfallUI.PostMessage(DaggerfallUIMessages.dfuiOpenInventoryWindow);
uiManager.PushWindow(DaggerfallUI.Instance.InventoryWindow);
}

void DisableEmptyCorpseContainer(GameObject go)
Expand Down Expand Up @@ -1087,7 +1087,8 @@ public void PrivateProperty_OnButtonClick(DaggerfallMessageBox sender, Daggerfal
if (messageBoxButton == DaggerfallMessageBox.MessageBoxButtons.Yes)
{
// Open inventory window with activated private container as remote target (pre-set)
DaggerfallUI.PostMessage(DaggerfallUIMessages.dfuiOpenInventoryWindow);
UserInterfaceManager uiManager = DaggerfallUI.Instance.UserInterfaceManager;
uiManager.PushWindow(DaggerfallUI.Instance.InventoryWindow);
}
else
DaggerfallUI.Instance.InventoryWindow.LootTarget = null;
Expand Down
6 changes: 4 additions & 2 deletions Assets/Scripts/Game/Questing/Actions/GivePc.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
using UnityEngine;
using System.Text.RegularExpressions;
using DaggerfallWorkshop.Utility;
using DaggerfallWorkshop.Game.UserInterface;
using DaggerfallWorkshop.Game.UserInterfaceWindows;
using FullSerializer;

Expand Down Expand Up @@ -190,8 +191,9 @@ private void QuestCompleteMessage_OnClose()
// Open loot reward container once QuestComplete dismissed
if (rewardLoot != null)
{
UserInterfaceManager uiManager = DaggerfallUI.Instance.UserInterfaceManager;
DaggerfallUI.Instance.InventoryWindow.LootTarget = rewardLoot;
DaggerfallUI.PostMessage(DaggerfallUIMessages.dfuiOpenInventoryWindow);
uiManager.PushWindow(DaggerfallUI.Instance.InventoryWindow);
}
}

Expand Down Expand Up @@ -244,4 +246,4 @@ protected virtual void RaiseOnOfferPendingEvent(GivePc sender)

#endregion
}
}
}