From 3bbe5a4835cb9ce1a668d7589a0c22122b2e4afa Mon Sep 17 00:00:00 2001 From: Jan Date: Thu, 30 Dec 2021 19:19:42 +0100 Subject: [PATCH] Remove outdated assertion for empty scriptstring list on loading --- src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp | 2 -- src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp | 2 -- src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp | 2 -- src/ZoneLoading/Game/T5/ContentLoaderT5.cpp | 2 -- src/ZoneLoading/Game/T6/ContentLoaderT6.cpp | 2 -- 5 files changed, 10 deletions(-) diff --git a/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp b/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp index cc222c36..08e18ea5 100644 --- a/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp +++ b/src/ZoneLoading/Game/IW3/ContentLoaderIW3.cpp @@ -40,8 +40,6 @@ ContentLoader::ContentLoader() void ContentLoader::LoadScriptStringList(const bool atStreamStart) { - assert(m_zone->m_script_strings.Empty()); - m_stream->PushBlock(XFILE_BLOCK_VIRTUAL); if (atStreamStart) diff --git a/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp b/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp index 10f056e8..9c265686 100644 --- a/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp +++ b/src/ZoneLoading/Game/IW4/ContentLoaderIW4.cpp @@ -50,8 +50,6 @@ ContentLoader::ContentLoader() void ContentLoader::LoadScriptStringList(const bool atStreamStart) { - assert(m_zone->m_script_strings.Empty()); - m_stream->PushBlock(XFILE_BLOCK_VIRTUAL); if (atStreamStart) diff --git a/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp b/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp index 81bdb8c3..3f63d81b 100644 --- a/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp +++ b/src/ZoneLoading/Game/IW5/ContentLoaderIW5.cpp @@ -55,8 +55,6 @@ ContentLoader::ContentLoader() void ContentLoader::LoadScriptStringList(const bool atStreamStart) { - assert(m_zone->m_script_strings.Empty()); - m_stream->PushBlock(XFILE_BLOCK_VIRTUAL); if (atStreamStart) diff --git a/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp b/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp index 34122243..c5fd6de3 100644 --- a/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp +++ b/src/ZoneLoading/Game/T5/ContentLoaderT5.cpp @@ -47,8 +47,6 @@ ContentLoader::ContentLoader() void ContentLoader::LoadScriptStringList(const bool atStreamStart) { - assert(m_zone->m_script_strings.Empty()); - m_stream->PushBlock(XFILE_BLOCK_VIRTUAL); if (atStreamStart) diff --git a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp index e7504d6a..cffe27ef 100644 --- a/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp +++ b/src/ZoneLoading/Game/T6/ContentLoaderT6.cpp @@ -63,8 +63,6 @@ ContentLoader::ContentLoader() void ContentLoader::LoadScriptStringList(const bool atStreamStart) { - assert(m_zone->m_script_strings.Empty()); - m_stream->PushBlock(XFILE_BLOCK_VIRTUAL); if (atStreamStart)