From 9162eaa0199d53d8fff050b313620bcb878200af Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 2 Apr 2023 19:58:27 +0200
Subject: [PATCH] Test more ESM::Player records

---
 apps/openmw_test_suite/esm3/testsaveload.cpp | 37 ++++++++++++++++++++
 components/esm3/cellid.cpp                   |  4 +++
 2 files changed, 41 insertions(+)

diff --git a/apps/openmw_test_suite/esm3/testsaveload.cpp b/apps/openmw_test_suite/esm3/testsaveload.cpp
index 0729b0ec26..049fcb6f1d 100644
--- a/apps/openmw_test_suite/esm3/testsaveload.cpp
+++ b/apps/openmw_test_suite/esm3/testsaveload.cpp
@@ -11,6 +11,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <array>
 #include <memory>
 #include <random>
@@ -175,6 +176,13 @@ namespace ESM
             }
 
             RefId generateRandomRefId(std::size_t size = 33) { return RefId::stringRefId(generateRandomString(size)); }
+
+            template <class T, std::size_t n>
+            void generateArray(T (&dst)[n])
+            {
+                for (auto& v : dst)
+                    v = std::uniform_real_distribution<float>{ -1.0f, 1.0f }(mRandom);
+            }
         };
 
         TEST_F(Esm3SaveLoadRecordTest, headerShouldNotChange)
@@ -240,10 +248,39 @@ namespace ESM
             record.mObject.mRef.mRefID = generateRandomRefId();
             std::generate_n(std::inserter(record.mPreviousItems, record.mPreviousItems.end()), 2,
                 [&] { return std::make_pair(generateRandomRefId(), generateRandomRefId()); });
+            record.mCellId.mWorldspace = "worldspace1";
+            record.mCellId.mIndex.mX = 42;
+            record.mCellId.mIndex.mY = 13;
+            record.mCellId.mPaged = true;
+            generateArray(record.mLastKnownExteriorPosition);
+            record.mHasMark = true;
+            record.mMarkedCell.mWorldspace = "worldspace2";
+            record.mMarkedCell.mIndex.mX = 0;
+            record.mMarkedCell.mIndex.mY = 0;
+            record.mMarkedCell.mPaged = false;
+            generateArray(record.mMarkedPosition.pos);
+            generateArray(record.mMarkedPosition.rot);
+            record.mCurrentCrimeId = 42;
+            record.mPaidCrimeId = 13;
             Player result;
             saveAndLoadRecord(record, GetParam(), result);
             EXPECT_EQ(record.mBirthsign, result.mBirthsign);
             EXPECT_EQ(record.mPreviousItems, result.mPreviousItems);
+            EXPECT_EQ(record.mPreviousItems, result.mPreviousItems);
+            EXPECT_EQ(record.mCellId.mWorldspace, result.mCellId.mWorldspace);
+            EXPECT_EQ(record.mCellId.mIndex.mX, result.mCellId.mIndex.mX);
+            EXPECT_EQ(record.mCellId.mIndex.mY, result.mCellId.mIndex.mY);
+            EXPECT_EQ(record.mCellId.mPaged, result.mCellId.mPaged);
+            EXPECT_THAT(record.mLastKnownExteriorPosition, ElementsAreArray(result.mLastKnownExteriorPosition));
+            EXPECT_EQ(record.mHasMark, result.mHasMark);
+            EXPECT_EQ(record.mMarkedCell.mWorldspace, result.mMarkedCell.mWorldspace);
+            EXPECT_EQ(record.mMarkedCell.mIndex.mX, result.mMarkedCell.mIndex.mX);
+            EXPECT_EQ(record.mMarkedCell.mIndex.mY, result.mMarkedCell.mIndex.mY);
+            EXPECT_EQ(record.mMarkedCell.mPaged, result.mMarkedCell.mPaged);
+            EXPECT_THAT(record.mMarkedPosition.pos, ElementsAreArray(result.mMarkedPosition.pos));
+            EXPECT_THAT(record.mMarkedPosition.rot, ElementsAreArray(result.mMarkedPosition.rot));
+            EXPECT_EQ(record.mCurrentCrimeId, result.mCurrentCrimeId);
+            EXPECT_EQ(record.mPaidCrimeId, result.mPaidCrimeId);
         }
 
         TEST_P(Esm3SaveLoadRecordTest, cellRefShouldNotChange)
diff --git a/components/esm3/cellid.cpp b/components/esm3/cellid.cpp
index a63a1bfad6..a8a812bf02 100644
--- a/components/esm3/cellid.cpp
+++ b/components/esm3/cellid.cpp
@@ -18,7 +18,11 @@ namespace ESM
             mPaged = true;
         }
         else
+        {
             mPaged = false;
+            mIndex.mX = 0;
+            mIndex.mY = 0;
+        }
     }
 
     void CellId::save(ESMWriter& esm) const