Merge branch 'OpenCS_DELE_write_size' into 'master'

For consistency with TES CS, force DELE record writes to be 4 bytes (currently writes 1 byte). See merge request OpenMW/openmw!999
2025-01-26 18:35:20 +00:00 · 2021-07-06 07:42:49 +00:00 · 2021-07-06 07:42:49 +00:00 · 06b852fbc8
commit 06b852fbc8
parent cda0c7ed44 a47ebf5c9e
41 changed files with 41 additions and 40 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -17,6 +17,7 @@
    Bug #6129: Player avatar not displayed correctly for large window sizes when GUI scaling active
    Bug #6131: Item selection in the avatar window not working correctly for large window sizes
    Bug #6133: Cannot reliably sneak or steal in the sight of the NPCs siding with player
+    Editor: For consistency with TES CS make DELE records 4 bytes long

 0.47.0
 ------
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@ -145,7 +145,7 @@ void ESM::CellRef::save (ESMWriter &esm, bool wideRefNum, bool inInventory, bool
    esm.writeHNCString("NAME", mRefID);

    if (isDeleted) {
-        esm.writeHNCString("DELE", "");
+        esm.writeHNString("DELE", "", 3);
        return;
    }

--- a/components/esm/debugprofile.cpp
+++ b/components/esm/debugprofile.cpp
@ -44,7 +44,7 @@ void ESM::DebugProfile::save (ESMWriter& esm, bool isDeleted) const

    if (isDeleted)
    {
-        esm.writeHNCString("DELE", "");
+        esm.writeHNString("DELE", "", 3);
        return;
    }

--- a/components/esm/filter.cpp
+++ b/components/esm/filter.cpp
@ -42,7 +42,7 @@ void ESM::Filter::save (ESMWriter& esm, bool isDeleted) const

    if (isDeleted)
    {
-        esm.writeHNCString("DELE", "");
+        esm.writeHNString("DELE", "", 3);
        return;
    }

--- a/components/esm/loadacti.cpp
+++ b/components/esm/loadacti.cpp
@ -50,7 +50,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadalch.cpp
+++ b/components/esm/loadalch.cpp
@ -65,7 +65,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadappa.cpp
+++ b/components/esm/loadappa.cpp
@ -61,7 +61,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadarmo.cpp
+++ b/components/esm/loadarmo.cpp
@ -99,7 +99,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadbody.cpp
+++ b/components/esm/loadbody.cpp
@ -55,7 +55,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadbook.cpp
+++ b/components/esm/loadbook.cpp
@ -66,7 +66,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadbsgn.cpp
+++ b/components/esm/loadbsgn.cpp
@ -56,7 +56,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }
        esm.writeHNOCString("FNAM", mName);
--- a/components/esm/loadcell.cpp
+++ b/components/esm/loadcell.cpp
@ -167,7 +167,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadclas.cpp
+++ b/components/esm/loadclas.cpp
@ -86,7 +86,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadclot.cpp
+++ b/components/esm/loadclot.cpp
@ -69,7 +69,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadcont.cpp
+++ b/components/esm/loadcont.cpp
@ -95,7 +95,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadcrea.cpp
+++ b/components/esm/loadcrea.cpp
@ -115,7 +115,7 @@ namespace ESM {

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loaddial.cpp
+++ b/components/esm/loaddial.cpp
@ -61,7 +61,7 @@ namespace ESM
        esm.writeHNCString("NAME", mId);
        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
        }
        else
        {
--- a/components/esm/loaddoor.cpp
+++ b/components/esm/loaddoor.cpp
@ -57,7 +57,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadench.cpp
+++ b/components/esm/loadench.cpp
@ -53,7 +53,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadfact.cpp
+++ b/components/esm/loadfact.cpp
@ -90,7 +90,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadinfo.cpp
+++ b/components/esm/loadinfo.cpp
@ -100,7 +100,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadingr.cpp
+++ b/components/esm/loadingr.cpp
@ -84,7 +84,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadland.cpp
+++ b/components/esm/loadland.cpp
@ -123,7 +123,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadlevlist.cpp
+++ b/components/esm/loadlevlist.cpp
@ -80,7 +80,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadligh.cpp
+++ b/components/esm/loadligh.cpp
@ -63,7 +63,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadlock.cpp
+++ b/components/esm/loadlock.cpp
@ -61,7 +61,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadltex.cpp
+++ b/components/esm/loadltex.cpp
@ -53,7 +53,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
        }
    }

--- a/components/esm/loadmisc.cpp
+++ b/components/esm/loadmisc.cpp
@ -61,7 +61,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadnpc.cpp
+++ b/components/esm/loadnpc.cpp
@ -135,7 +135,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadpgrd.cpp
+++ b/components/esm/loadpgrd.cpp
@ -156,7 +156,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadprob.cpp
+++ b/components/esm/loadprob.cpp
@ -61,7 +61,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadrace.cpp
+++ b/components/esm/loadrace.cpp
@ -68,7 +68,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadregn.cpp
+++ b/components/esm/loadregn.cpp
@ -89,7 +89,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadrepa.cpp
+++ b/components/esm/loadrepa.cpp
@ -61,7 +61,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadscpt.cpp
+++ b/components/esm/loadscpt.cpp
@ -155,7 +155,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadsndg.cpp
+++ b/components/esm/loadsndg.cpp
@ -54,7 +54,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadsoun.cpp
+++ b/components/esm/loadsoun.cpp
@ -52,7 +52,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadspel.cpp
+++ b/components/esm/loadspel.cpp
@ -59,7 +59,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }

--- a/components/esm/loadsscr.cpp
+++ b/components/esm/loadsscr.cpp
@ -47,7 +47,7 @@ namespace ESM
        esm.writeHNCString("NAME", mId);
        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
        }
        else
        {
--- a/components/esm/loadstat.cpp
+++ b/components/esm/loadstat.cpp
@ -43,7 +43,7 @@ namespace ESM
        esm.writeHNCString("NAME", mId);
        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
        }
        else
        {
--- a/components/esm/loadweap.cpp
+++ b/components/esm/loadweap.cpp
@ -62,7 +62,7 @@ namespace ESM

        if (isDeleted)
        {
-            esm.writeHNCString("DELE", "");
+            esm.writeHNString("DELE", "", 3);
            return;
        }