From 4097fc4e336744c7e0675befb12bfd0cca973667 Mon Sep 17 00:00:00 2001
From: Jonathan G Rennison <j.g.rennison@gmail.com>
Date: Mon, 19 Feb 2024 18:44:25 +0000
Subject: [PATCH] Saveload: Enable upstream mode SlAutolength

Use non-upstream implementation for SlCopyBytes
---
 src/saveload/saveload.cpp | 23 +++++++++++++++++------
 src/sl/saveload.cpp       | 10 ++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp
index 00b2c01559..654b23d2d7 100644
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -48,6 +48,11 @@
 StringID RemapOldStringID(StringID s);
 std::string CopyFromOldName(StringID id);
 
+extern uint8_t SlSaveToTempBufferSetup();
+extern std::span<byte> SlSaveToTempBufferRestore(uint8_t state);
+extern void SlCopyBytesRead(void *ptr, size_t length);
+extern void SlCopyBytesWrite(void *ptr, size_t length);
+
 namespace upstream_sl {
 
 /** What are we currently doing? */
@@ -491,15 +496,13 @@ void SlSetLength(size_t length)
  */
 static void SlCopyBytes(void *ptr, size_t length)
 {
-	byte *p = (byte *)ptr;
-
 	switch (_sl.action) {
 		case SLA_LOAD_CHECK:
 		case SLA_LOAD:
-			for (; length != 0; length--) *p++ = SlReadByte();
+			SlCopyBytesRead(ptr, length);
 			break;
 		case SLA_SAVE:
-			for (; length != 0; length--) SlWriteByte(*p++);
+			SlCopyBytesWrite(ptr, length);
 			break;
 		default: NOT_REACHED();
 	}
@@ -1820,8 +1823,16 @@ void SlGlobList(const SaveLoadTable &slt)
  */
 void SlAutolength(AutolengthProc *proc, void *arg)
 {
-	// removed
-	NOT_REACHED();
+	assert(_sl.action == SLA_SAVE);
+	assert(_sl.need_length == NL_WANTLENGTH);
+
+	_sl.need_length = NL_NONE;
+	uint8_t state = SlSaveToTempBufferSetup();
+	proc(arg);
+	std::span<byte> result = SlSaveToTempBufferRestore(state);
+	_sl.need_length = NL_WANTLENGTH;
+	SlSetLength(result.size());
+	SlCopyBytesWrite(result.data(), result.size());
 }
 
 void ChunkHandler::LoadCheck(size_t len) const
diff --git a/src/sl/saveload.cpp b/src/sl/saveload.cpp
index 9a31d5ddaf..065cfc17bb 100644
--- a/src/sl/saveload.cpp
+++ b/src/sl/saveload.cpp
@@ -931,6 +931,16 @@ static void SlCopyBytes(void *ptr, size_t length)
 	}
 }
 
+void SlCopyBytesRead(void *p, size_t length)
+{
+	_sl.reader->CopyBytes((byte *)p, length);
+}
+
+void SlCopyBytesWrite(void *p, size_t length)
+{
+	_sl.dumper->CopyBytes((byte *)p, length);
+}
+
 /** Get the length of the current object */
 size_t SlGetFieldLength()
 {