Skip to content
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

Jump to bottom

[FNV] NPC Assertion Fix #1309

Merged
merged 1 commit into from
Apr 25, 2024
Merged

[FNV] NPC Assertion Fix #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions xEdit/xeMainForm.dfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ object frmMain: TfrmMain
Align = alClient
BevelOuter = bvNone
TabOrder = 0
ExplicitWidth = 1354
ExplicitHeight = 639
object splElements: TSplitter
Left = 455
Top = 30
Expand All @@ -54,6 +56,8 @@ object frmMain: TfrmMain
end>
ParentFont = True
UseSystemFont = False
ExplicitTop = 618
ExplicitWidth = 1354
end
object pnlRight: TPanel
Left = 458
Expand All @@ -64,6 +68,8 @@ object frmMain: TfrmMain
BevelOuter = bvNone
BorderStyle = bsSingle
TabOrder = 1
ExplicitWidth = 896
ExplicitHeight = 585
object pgMain: TPageControl
Left = 0
Top = 0
Expand All @@ -75,6 +81,8 @@ object frmMain: TfrmMain
TabOrder = 0
TabPosition = tpBottom
OnChange = pgMainChange
ExplicitWidth = 892
ExplicitHeight = 581
object tbsView: TTabSheet
Caption = 'View'
OnShow = tbsViewShow
Expand Down Expand Up @@ -164,6 +172,7 @@ object frmMain: TfrmMain
Align = alTop
BevelOuter = bvNone
TabOrder = 1
ExplicitWidth = 884
object fpnlViewFilter: TFlowPanel
Left = 0
Top = 0
Expand All @@ -173,6 +182,7 @@ object frmMain: TfrmMain
BevelOuter = bvNone
TabOrder = 0
OnResize = fpnlViewFilterResize
ExplicitWidth = 818
object bnPinned: TSpeedButton
Left = 0
Top = 0
Expand Down Expand Up @@ -303,6 +313,7 @@ object frmMain: TfrmMain
Align = alRight
BevelOuter = bvNone
TabOrder = 1
ExplicitLeft = 818
object bnLegend: TSpeedButton
AlignWithMargins = True
Left = 3
Expand Down Expand Up @@ -1254,6 +1265,7 @@ object frmMain: TfrmMain
Align = alTop
BevelOuter = bvNone
TabOrder = 2
ExplicitWidth = 1354
object bnMainMenu: TSpeedButton
Tag = 1
AlignWithMargins = True
Expand Down Expand Up @@ -1462,6 +1474,7 @@ object frmMain: TfrmMain
TabOrder = 0
Visible = False
StyleElements = [seFont, seBorder]
ExplicitWidth = 759
end
object pnlBtn: TPanel
AlignWithMargins = True
Expand All @@ -1475,6 +1488,7 @@ object frmMain: TfrmMain
BevelOuter = bvNone
PopupMenu = pmuBtnMenu
TabOrder = 1
ExplicitLeft = 856
object bnPayPal: TSpeedButton
AlignWithMargins = True
Left = 442
Expand Down Expand Up @@ -1985,6 +1999,7 @@ object frmMain: TfrmMain
BevelOuter = bvNone
TabOrder = 3
OnResize = pnlNavResize
ExplicitHeight = 585
object pnlNavContent: TPanel
Left = 0
Top = 0
Expand All @@ -1993,6 +2008,7 @@ object frmMain: TfrmMain
Align = alClient
BevelOuter = bvNone
TabOrder = 0
ExplicitHeight = 585
object lblFilterHint: TLabel
AlignWithMargins = True
Left = 3
Expand All @@ -2007,6 +2023,7 @@ object frmMain: TfrmMain
'ply the filter if necessary.'
Visible = False
WordWrap = True
ExplicitWidth = 440
end
object vstNav: TVirtualEditTree
Left = 0
Expand Down Expand Up @@ -2149,6 +2166,7 @@ object frmMain: TfrmMain
BevelOuter = bvNone
BevelWidth = 3
TabOrder = 2
ExplicitTop = 556
DesignSize = (
455
29)
Expand Down
3 changes: 0 additions & 3 deletions xEdit/xeMainForm.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17617,9 +17617,6 @@ procedure TfrmMain.vstViewBeforeItemErase(Sender: TBaseVirtualTree;
NodeDatas : PViewNodeDatas;
begin
NodeDatas := Sender.GetNodeData(Node);
if NodeDatas[0].ConflictAll = caUnknown then
Assert(False);

if NodeDatas[0].ConflictAll >= caNoConflict then
ItemColor := wbLighter(ConflictAllToColor(NodeDatas[0].ConflictAll), 0.85)
else
Expand Down