implemented issue #902: Option to ignore MHDT conflicts when using Ve…

…ry Quick Show Conflicts (use `-IgnoreWorldMHDT` parameter)
TES5Edit · Nov 10, 2021 · c4d7f36 · c4d7f36
1 parent f05381a
commit c4d7f36
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 21 deletions.
diff --git a/wbDefinitionsFO4.pas b/wbDefinitionsFO4.pas
@@ -6587,6 +6587,9 @@ function wbTintLayerToStr(aInt: Int64; const aElement: IwbElement; aType: TwbCal
 var
   wbRecordFlagsFlags : IwbFlagsDef;
 
+const
+  wbWorldMHDTConflictPriority : array[Boolean] of TwbConflictPriority = (cpNormalIgnoreEmpty, cpIgnore);
+
 procedure DefineFO4a;
 
 begin
@@ -7799,7 +7802,7 @@ procedure DefineFO4a;
 
   if wbSimpleRecords then begin
     wbMaxHeightDataCELL := wbByteArray(MHDT, 'Max Height Data', 0, cpNormal);
-    wbMaxHeightDataWRLD := wbByteArray(MHDT, 'Max Height Data', 0, cpNormal);
+    wbMaxHeightDataWRLD := wbByteArray(MHDT, 'Max Height Data', 0, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]);
   end
   else begin
     wbMaxHeightDataCELL := wbStruct(MHDT, 'Max Height Data', [
@@ -7812,22 +7815,22 @@ procedure DefineFO4a;
     ]);
     wbMaxHeightDataWRLD := wbStruct(MHDT, 'Max Height Data', [
       wbStruct('Min', [
-        wbInteger('X', itS16),
-        wbInteger('Y', itS16)
+        wbInteger('X', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]),
+        wbInteger('Y', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       ]),
       wbStruct('Max', [
-        wbInteger('X', itS16),
-        wbInteger('Y', itS16)
+        wbInteger('X', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]),
+        wbInteger('Y', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       ]),
-      wbByteArray('Cell Data', 0)
+      wbByteArray('Cell Data', 0, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       // way too verbose for no practical use
       {wbArray('Cell Data', wbStruct('Quad Height', [
         wbInteger('Bottom Left', itU8),
         wbInteger('Bottom Right', itU8),
         wbInteger('Top Left', itU8),
         wbInteger('Top Right', itU8)
       ]))}
-    ]);
+    ], wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]);
   end;
 
   if wbSimpleRecords then

diff --git a/wbDefinitionsFO76.pas b/wbDefinitionsFO76.pas
@@ -7119,6 +7119,9 @@ function wbTintLayerToStr(aInt: Int64; const aElement: IwbElement; aType: TwbCal
 var
   wbRecordFlagsFlags : IwbFlagsDef;
 
+const
+  wbWorldMHDTConflictPriority : array[Boolean] of TwbConflictPriority = (cpNormalIgnoreEmpty, cpIgnore);
+
 procedure DefineFO76a;
 
 begin
@@ -8432,7 +8435,7 @@ procedure DefineFO76a;
 
   if wbSimpleRecords then begin
     wbMaxHeightDataCELL := wbByteArray(MHDT, 'Max Height Data', 0, cpNormal);
-    wbMaxHeightDataWRLD := wbByteArray(MHDT, 'Max Height Data', 0, cpNormal);
+    wbMaxHeightDataWRLD := wbByteArray(MHDT, 'Max Height Data', 0, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]);
   end
   else begin
     wbMaxHeightDataCELL := wbStruct(MHDT, 'Max Height Data', [
@@ -8445,22 +8448,22 @@ procedure DefineFO76a;
     ]);
     wbMaxHeightDataWRLD := wbStruct(MHDT, 'Max Height Data', [
       wbStruct('Min', [
-        wbInteger('X', itS16),
-        wbInteger('Y', itS16)
+        wbInteger('X', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]),
+        wbInteger('Y', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       ]),
       wbStruct('Max', [
-        wbInteger('X', itS16),
-        wbInteger('Y', itS16)
+        wbInteger('X', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]),
+        wbInteger('Y', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       ]),
-      wbByteArray('Cell Data', 0)
+      wbByteArray('Cell Data', 0, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       // way too verbose for no practical use
       {wbArray('Cell Data', wbStruct('Quad Height', [
         wbInteger('Bottom Left', itU8),
         wbInteger('Bottom Right', itU8),
         wbInteger('Top Left', itU8),
         wbInteger('Top Right', itU8)
       ]))}
-    ]);
+    ], wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]);
   end;
 
   if wbSimpleRecords then

diff --git a/wbDefinitionsTES5.pas b/wbDefinitionsTES5.pas
@@ -5048,6 +5048,9 @@ function wbTintLayerToStr(aInt: Int64; const aElement: IwbElement; aType: TwbCal
 var
   wbRecordFlagsFlags : IwbFlagsDef;
 
+const
+  wbWorldMHDTConflictPriority : array[Boolean] of TwbConflictPriority = (cpNormalIgnoreEmpty, cpIgnore);
+
 procedure DefineTES5a;
 
 begin
@@ -6163,7 +6166,7 @@ procedure DefineTES5a;
 
   if wbSimpleRecords then begin
     wbMaxHeightDataCELL := wbByteArray(MHDT, 'Max Height Data', 0, cpNormal);
-    wbMaxHeightDataWRLD := wbByteArray(MHDT, 'Max Height Data', 0, cpNormalIgnoreEmpty);
+    wbMaxHeightDataWRLD := wbByteArray(MHDT, 'Max Height Data', 0, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]);
   end
   else begin
     wbMaxHeightDataCELL := wbStruct(MHDT, 'Max Height Data', [
@@ -6176,22 +6179,22 @@ procedure DefineTES5a;
     ]);
     wbMaxHeightDataWRLD := wbStruct(MHDT, 'Max Height Data', [
       wbStruct('Min', [
-        wbInteger('X', itS16, nil, nil, cpNormalIgnoreEmpty),
-        wbInteger('Y', itS16, nil, nil, cpNormalIgnoreEmpty)
+        wbInteger('X', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]),
+        wbInteger('Y', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       ]),
       wbStruct('Max', [
-        wbInteger('X', itS16, nil, nil, cpNormalIgnoreEmpty),
-        wbInteger('Y', itS16, nil, nil, cpNormalIgnoreEmpty)
+        wbInteger('X', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]),
+        wbInteger('Y', itS16, nil, nil, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       ]),
-      wbByteArray('Cell Data', 0, cpNormalIgnoreEmpty)
+      wbByteArray('Cell Data', 0, wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT])
       // way too verbose for no practical use
       {wbArray('Cell Data', wbStruct('Quad Height', [
         wbInteger('Bottom Left', itU8),
         wbInteger('Bottom Right', itU8),
         wbInteger('Top Left', itU8),
         wbInteger('Top Right', itU8)
       ]))}
-    ], cpNormalIgnoreEmpty);
+    ], wbWorldMHDTConflictPriority[wbIgnoreWorldMHDT]);
   end;
 
   if wbSimpleRecords then

diff --git a/wbInit.pas b/wbInit.pas
@@ -1070,6 +1070,9 @@ function wbDoInit: Boolean;
   else if FindCmdLineSwitch('hidefixup') then
     wbShowInternalEdit := False;
 
+  if FindCmdLineSwitch('IgnoreWorldMHDT') then
+    wbIgnoreWorldMHDT := True;
+
   if wbQuickClean then begin
     wbFixupPGRD := True;
     wbAllowInternalEdit := True;

diff --git a/wbInterface.pas b/wbInterface.pas
@@ -213,6 +213,8 @@   TwbTwoPtr = record
   wbAllowInternalEdit : Boolean = True;
   wbShowInternalEdit  : Boolean = False;
 
+  wbIgnoreWorldMHDT : Boolean = False;
+
   wbReportMode                       : Boolean = False;
   wbReportUnused                     : Boolean = False;
   wbReportRequired                   : Boolean = False;

diff --git a/whatsnew.md b/whatsnew.md
@@ -47,6 +47,7 @@
 
 * #827 - Allow SSEEdit to Minimize during processing
 * #901 - "Unhide all..." option in column context menu
+* #902 - Option to ignore MHDT conflicts when using Very Quick Show Conflicts (use `-IgnoreWorldMHDT` parameter)
 
 ## Enderal Special Edition