Merge pull request H-uru#1415 from dgelessus/remove_old_safestring_fo…

…rmat Drop SafeString "backward compat hack" from 20 years ago
Deledrius · Jun 30, 2023 · 6d2eb8d · 6d2eb8d
2 parents 814a6ac + a599242
commit 6d2eb8d
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/Sources/Plasma/CoreLib/hsStream.cpp b/Sources/Plasma/CoreLib/hsStream.cpp
@@ -155,12 +155,7 @@ ST::string hsStream::ReadSafeString()
     ST::char_buffer name;
     uint16_t numChars = ReadLE16();
 
-#ifndef REMOVE_ME_SOON
-    // Backward compat hack - remove in a week or so (from 6/30/03)
-    bool oldFormat = !(numChars & 0xf000);
-    if (oldFormat)
-        (void)ReadLE16();
-#endif
+    hsAssert(numChars & 0xf000, "SafeString in old (pre-2003) format");
 
     numChars &= ~0xf000;
     hsAssert(numChars <= GetSizeLeft(), "Bad string");