From 9984b59ea9fef3af4108dc11673d061fb2d61bf0 Mon Sep 17 00:00:00 2001
From: Solessfir <34831419+Solessfir@users.noreply.github.com>
Date: Sat, 12 Sep 2026 21:41:21 +0200
Subject: [PATCH 1/2] Read save archives without redundant ZIP metadata
 decoding

---
 common/game/serialize.cpp | 30 ++++++++++++++++++------------
 common/game/serialize.h   |  2 +-
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/common/game/serialize.cpp b/common/game/serialize.cpp
index c3422b3a0..0c0220be5 100644
--- a/common/game/serialize.cpp
+++ b/common/game/serialize.cpp
@@ -76,6 +76,8 @@ Serialize::Serialize(Tempest::IDevice& fin) : fin(&fin) {
   }
 
 Serialize::~Serialize() {
+  if(fin!=nullptr)
+    mz_zip_reader_end(&impl);
   closeEntry();
   if(fout!=nullptr) {
     mz_zip_writer_finalize_archive(&impl);
@@ -148,20 +150,24 @@ bool Serialize::implSetEntry(std::string_view fname) {
   }
 
 uint32_t Serialize::implDirectorySize(std::string_view e) {
-  // Get and print information about each file in the archive.
-  uint32_t cnt = 0;
-  for(mz_uint i = 0; i<mz_zip_reader_get_num_files(&impl); i++) {
-    mz_zip_archive_file_stat stat = {};
-    if(!mz_zip_reader_file_stat(&impl, i, &stat))
+  uint32_t count = 0;
+  std::vector<char> filename;
+  for(mz_uint i=0; i<mz_zip_reader_get_num_files(&impl); ++i) {
+    const auto length = mz_zip_reader_get_filename(&impl, i, nullptr, 0);
+    if(length==0)
       throw std::runtime_error("unable to locate entry in game archive");
-    auto len = std::strlen(stat.m_filename);
-    if(len>e.size() && std::memcmp(e.data(),stat.m_filename,e.size())==0) {
-      auto sep = std::strchr(stat.m_filename+e.size(),'/');
-      if(sep==nullptr || (sep+1)==(stat.m_filename+len))
-        ++cnt;
-      }
+    filename.resize(length);
+    if(mz_zip_reader_get_filename(&impl, i, filename.data(), length)!=length)
+      throw std::runtime_error("unable to read entry name in game archive");
+    const std::string_view name(filename.data(), length-1);
+    if(name.size()<=e.size() || !name.starts_with(e))
+      continue;
+    const auto child = name.substr(e.size());
+    const auto separator = child.find('/');
+    if(separator==std::string_view::npos || separator+1==child.size())
+      ++count;
     }
-  return cnt;
+  return count;
   }
 
 void Serialize::writeBytes(const void* buf, size_t sz) {
diff --git a/common/game/serialize.h b/common/game/serialize.h
index 0ec3d2af1..584cf88fd 100644
--- a/common/game/serialize.h
+++ b/common/game/serialize.h
@@ -45,7 +45,7 @@ class Serialize {
       };
     Serialize(Tempest::ODevice& fout);
     Serialize(Tempest::IDevice&  fin);
-    Serialize(Serialize&&)=default;
+    Serialize(Serialize&&)=delete;
     ~Serialize();
 
     uint16_t version()              const { return wldVer; }

From 35dc18d9108fb89ccb59314d0f9db71f639d64c6 Mon Sep 17 00:00:00 2001
From: Try <try9998@gmail.com>
Date: Mon, 14 Sep 2026 22:13:59 +0200
Subject: [PATCH 2/2] nitpicks

---
 common/game/serialize.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/common/game/serialize.cpp b/common/game/serialize.cpp
index 0c0220be5..170ff7d04 100644
--- a/common/game/serialize.cpp
+++ b/common/game/serialize.cpp
@@ -152,6 +152,7 @@ bool Serialize::implSetEntry(std::string_view fname) {
 uint32_t Serialize::implDirectorySize(std::string_view e) {
   uint32_t count = 0;
   std::vector<char> filename;
+  filename.reserve(256);
   for(mz_uint i=0; i<mz_zip_reader_get_num_files(&impl); ++i) {
     const auto length = mz_zip_reader_get_filename(&impl, i, nullptr, 0);
     if(length==0)
@@ -159,7 +160,7 @@ uint32_t Serialize::implDirectorySize(std::string_view e) {
     filename.resize(length);
     if(mz_zip_reader_get_filename(&impl, i, filename.data(), length)!=length)
       throw std::runtime_error("unable to read entry name in game archive");
-    const std::string_view name(filename.data(), length-1);
+    std::string_view name(filename.data(), length-1);
     if(name.size()<=e.size() || !name.starts_with(e))
       continue;
     const auto child = name.substr(e.size());