Merge branch 'main' into ly-as-sdk/LYN-2948

Code/CryEngine/CrySystem/LevelSystem/LevelSystem.cpp

@@ -17,7 +17,6 @@
 #include "LevelSystem.h"
 #include <IAudioSystem.h>
 #include "IMovieSystem.h"
-#include <IResourceManager.h>
 #include <ILocalizationManager.h>
 #include "CryPath.h"
 #include <Pak/CryPakUtils.h>
@@ -261,16 +260,6 @@ void CLevelSystem::Rescan(const char* levelsFolder)
 {
     if (levelsFolder)
     {
-        if (const ICmdLineArg* pModArg = m_pSystem->GetICmdLine()->FindArg(eCLAT_Pre, "MOD"))
-        {
-            if (m_pSystem->IsMODValid(pModArg->GetValue()))
-            {
-                m_levelsFolder.format("Mods/%s/%s", pModArg->GetValue(), levelsFolder);
-                m_levelInfos.clear();
-                ScanFolder(0, true);
-            }
-        }
-
         m_levelsFolder = levelsFolder;
     }
 
@@ -778,9 +767,6 @@ void CLevelSystem::PrepareNextLevel(const char* levelName)
         // switched to level heap, so now imm start the loading screen (renderer will be reinitialized in the levelheap)
         gEnv->pSystem->GetISystemEventDispatcher()->OnSystemEvent(ESYSTEM_EVENT_LEVEL_LOAD_START_LOADINGSCREEN, 0, 0);
         gEnv->pSystem->SetSystemGlobalState(ESYSTEM_GLOBAL_STATE_LEVEL_LOAD_START_PREPARE);
-
-        // Inform resource manager about loading of the new level.
-        GetISystem()->GetIResourceManager()->PrepareLevel(pLevelInfo->GetPath(), pLevelInfo->GetName());
     }
 
     for (AZStd::vector<ILevelSystemListener*>::const_iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
@@ -987,8 +973,6 @@ void CLevelSystem::UnloadLevel()
 
     m_lastLevelName.clear();
 
-    GetISystem()->GetIResourceManager()->UnloadLevel();
-
     SAFE_RELEASE(m_pCurrentLevel);
     
     // Force Lua garbage collection (may no longer be needed now the legacy renderer has been removed).

Code/CryEngine/CrySystem/LevelSystem/SpawnableLevelSystem.cpp

@@ -14,7 +14,6 @@
 #include "SpawnableLevelSystem.h"
 #include <IAudioSystem.h>
 #include "IMovieSystem.h"
-#include <IResourceManager.h>
 
 #include <LoadScreenBus.h>
 
@@ -566,8 +565,6 @@ namespace LegacyLevelSystem
 
         m_lastLevelName.clear();
 
-        GetISystem()->GetIResourceManager()->UnloadLevel();
-
         // Force Lua garbage collection (may no longer be needed now the legacy renderer has been removed).
         // Normally the GC step is triggered at the end of this method (by the ESYSTEM_EVENT_LEVEL_POST_UNLOAD event).
         EBUS_EVENT(AZ::ScriptSystemRequestBus, GarbageCollect);