From 151727af9e3dbe1029a33284a6f3afa4436db500 Mon Sep 17 00:00:00 2001
From: powerof3 <powerof3@users.noreply.github.com>
Date: Thu, 26 Dec 2024 10:51:05 +0530
Subject: [PATCH] Adjust class sizes for 1.6.640

---
 include/RE/A/ArchiveStream.h           | 4 ----
 include/RE/A/AsyncStream.h             | 4 ----
 include/RE/C/CompressedArchiveStream.h | 4 ----
 include/RE/D/DevNull.h                 | 4 ----
 include/RE/S/Stream.h                  | 4 ----
 include/RE/S/StreamBase.h              | 9 +--------
 6 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/include/RE/A/ArchiveStream.h b/include/RE/A/ArchiveStream.h
index afb737853..e74607bbf 100644
--- a/include/RE/A/ArchiveStream.h
+++ b/include/RE/A/ArchiveStream.h
@@ -34,10 +34,6 @@ namespace RE
 			std::uint32_t currentOffset;  // 1C
 			BSFixedString name;           // 20
 		};
-#ifdef SKYRIM_SUPPORT_AE
-		static_assert(sizeof(ArchiveStream) == 0x30);
-#else
 		static_assert(sizeof(ArchiveStream) == 0x28);
-#endif
 	}
 }
diff --git a/include/RE/A/AsyncStream.h b/include/RE/A/AsyncStream.h
index 6fa5a3510..a586caed9 100644
--- a/include/RE/A/AsyncStream.h
+++ b/include/RE/A/AsyncStream.h
@@ -26,10 +26,6 @@ namespace RE
 			std::uint32_t minPacketSize;  // 10
 			std::uint32_t pad14;          // 14
 		};
-#ifdef SKYRIM_SUPPORT_AE
-		static_assert(sizeof(AsyncStream) == 0x20);
-#else
 		static_assert(sizeof(AsyncStream) == 0x18);
-#endif
 	}
 }
diff --git a/include/RE/C/CompressedArchiveStream.h b/include/RE/C/CompressedArchiveStream.h
index 87ce2be03..a0031b027 100644
--- a/include/RE/C/CompressedArchiveStream.h
+++ b/include/RE/C/CompressedArchiveStream.h
@@ -40,10 +40,6 @@ namespace RE
 			std::uint32_t totalRead;  // 30
 			std::uint32_t unk34;      // 34
 		};
-#ifdef SKYRIM_SUPPORT_AE
-		static_assert(sizeof(CompressedArchiveStream) == 0x40);
-#else
 		static_assert(sizeof(CompressedArchiveStream) == 0x38);
-#endif
 	}
 }
diff --git a/include/RE/D/DevNull.h b/include/RE/D/DevNull.h
index f1fa6d6c0..57a2d469b 100644
--- a/include/RE/D/DevNull.h
+++ b/include/RE/D/DevNull.h
@@ -30,11 +30,7 @@ namespace RE
 				ErrorCode DoWrite(const void* a_buffer, std::uint64_t a_toWrite, std::uint64_t& a_written) const override;  // 07
 				ErrorCode DoSeek(std::uint64_t a_toSeek, SeekMode a_mode, std::uint64_t& a_sought) const override;          // 08
 			};
-#ifdef SKYRIM_SUPPORT_AE
-			static_assert(sizeof(NullStream) == 0x18);
-#else
 			static_assert(sizeof(NullStream) == 0x10);
-#endif
 
 			~DevNull() override;  // 00
 
diff --git a/include/RE/S/Stream.h b/include/RE/S/Stream.h
index 2505c0e5a..2d42c09d9 100644
--- a/include/RE/S/Stream.h
+++ b/include/RE/S/Stream.h
@@ -38,10 +38,6 @@ namespace RE
 			virtual bool      DoGetName(BSFixedString& a_dst) const;                                                       // 0A - { a_dst = ""; return false; }
 			virtual ErrorCode DoCreateAsync(BSTSmartPointer<AsyncStream>& a_streamOut) const;                              // 0B - { return ErrorCode::kUnsupported; }
 		};
-#ifdef SKYRIM_SUPPORT_AE
-		static_assert(sizeof(Stream) == 0x18);
-#else
 		static_assert(sizeof(Stream) == 0x10);
-#endif
 	}
 }
diff --git a/include/RE/S/StreamBase.h b/include/RE/S/StreamBase.h
index 87f54debb..5d5302b2e 100644
--- a/include/RE/S/StreamBase.h
+++ b/include/RE/S/StreamBase.h
@@ -42,15 +42,8 @@ namespace RE
 
 			// members
 			std::uint32_t totalSize;  // 08
-#ifdef SKYRIM_SUPPORT_AE
-			std::uint32_t unk0C;  // 0C
-#endif
-			std::uint32_t flags;  // 10
+			std::uint32_t flags;      // 10
 		};
-#ifdef SKYRIM_SUPPORT_AE
-		static_assert(sizeof(StreamBase) == 0x18);
-#else
 		static_assert(sizeof(StreamBase) == 0x10);
-#endif
 	}
 }