static puzzle data!

src/gen/Def.h

@@ -1,4 +1,7 @@
 #pragma once
+#include "../game/Log.h"
+
+#include "bx/string.h"
 #include <bx/file.h>
 #include <cstdint>
 
@@ -19,18 +22,21 @@ namespace Generated
 
         template <typename T> bool WriteT(const char* _4cc, const T& data)
         {
-            Writer.write(_4cc, 4, &Err);
-            if (!Err.isOk()) return false;
+            if (!Write(_4cc, 4)) return false;
+
             uint32_t hash = data.Hash;
-            Writer.write(&hash, sizeof(hash), &Err);
+            if (!Write(&hash, sizeof(hash))) return false;
+
             uint32_t size = sizeof(T);
-            Writer.write(&size, sizeof(size), &Err);
-            return Err.isOk() && Save(&data, 1, *this);
+            if (!Write(&size, sizeof(size))) return false;
+
+            return Save(&data, 1, *this);
         }
 
         bool Write(const void* data, uint32_t size)
         {
             Writer.write(data, size, &Err);
+            if (!Err.isOk()) LOG_ERROR("Write error: %s", Err.getMessage().getCPtr());
             return Err.isOk();
         }
 
@@ -56,9 +62,47 @@ namespace Generated
         bool Read(void* data, uint32_t size)
         {
             Reader.read(data, size, &Err);
+            if (!Err.isOk()) LOG_ERROR("Read error: %s", Err.getMessage().getCPtr());
             return Err.isOk();
         }
 
+        template <typename T> bool ReadT(const char* _4cc, T& data)
+        {
+            char magic[5]{0};
+            if (!Read(magic, 4)) return false;
+
+            bx::StringView given{_4cc, 4};
+            bx::StringView loaded{magic, 4};
+            if (bx::strCmp(given, loaded) != 0)
+            {
+                LOG_ERROR("Magic mismatch! %s != %s", _4cc, magic);
+                return false;
+            }
+
+            uint32_t hash = 0;
+            if (!Read(&hash, sizeof(hash))) return false;
+            if (data.Hash != hash)
+            {
+                LOG_ERROR("Hash mismatch! %u != %u", data.Hash, hash);
+                return false;
+            }
+
+            uint32_t size = 0;
+            if (!Read(&size, sizeof(size))) return false;
+            if (sizeof(T) != size)
+            {
+                LOG_ERROR("Size mismatch! %u != %u", sizeof(T), size);
+                return false;
+            }
+
+            if (!Load(&data, 1, *this))
+            {
+                LOG_ERROR("Failed to load: %s", Err.getMessage().getCPtr());
+                return false;
+            }
+            return true;
+        }
+
         void Finish()
         {
             Reader.close();

src/gen/Generated.cpp

@@ -17,7 +17,7 @@ namespace Generated
         bool isOk = true;
         for (uint32_t i = 0; i < count; ++i)
         {
-            auto val = (int32_t)obj[i];
+            int32_t& val = (int32_t&)obj[i];
             isOk = Load(&val, 1, serializer) && isOk;
         }
         return isOk;
@@ -123,7 +123,6 @@ namespace Generated
         bool isOk = true;
         for (uint32_t i = 0; i < count; ++i)
         {
-            isOk = Save(&obj[i].CardCount, 1, serializer) && isOk;
             isOk = Save(obj[i].Cards, 64, serializer) && isOk;
         }
         return isOk;
@@ -133,7 +132,6 @@ namespace Generated
         bool isOk = true;
         for (uint32_t i = 0; i < count; ++i)
         {
-            isOk = Load(&obj[i].CardCount, 1, serializer) && isOk;
             isOk = Load(obj[i].Cards, 64, serializer) && isOk;
         }
         return isOk;

src/gen/Generated.h

@@ -48,7 +48,7 @@ namespace Generated
             "~",
             "e+",
             "e-",
-            "█",
+            "B",
             "#",
         };
     };
@@ -82,8 +82,7 @@ namespace Generated
     };
     struct StaticPuzzleData
     {
-        static constexpr uint32_t Hash = 2220151575;
-        uint16_t CardCount = {};
+        static constexpr uint32_t Hash = 1881743597;
         StaticPuzzleCard Cards[64] = {};
     };
     struct PuzzleCardStack