🐛 Also unload default terrain script when used.

Zentro · Feb 21, 2022 · f26e5a7 · f26e5a7
1 parent 1db14cd
commit f26e5a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/source/main/scripting/ScriptEngine.h b/source/main/scripting/ScriptEngine.h
@@ -29,6 +29,8 @@
 
 #define TRIGGER_EVENT(x, y) App::GetScriptEngine()->triggerEvent((x), (y))
 
+#define DEFAULT_TERRAIN_SCRIPT "default.as" // Used when map creator doesn't provide custom script.
+
 #include "Application.h"
 #include "GameScript.h"
 #include "InterThreadStoreVector.h"

diff --git a/source/main/terrain/TerrainManager.cpp b/source/main/terrain/TerrainManager.cpp
@@ -120,9 +120,16 @@ TerrainManager::~TerrainManager()
         m_collisions = nullptr;
     }
 
-    for (std::string as_filename : m_def.as_files)
+    if (m_def.as_files.size() != 0)
+    {
+        for (std::string as_filename : m_def.as_files)
+        {
+            App::GetScriptEngine()->unloadScript(as_filename, ScriptCategory::TERRAIN);
+        }
+    }
+    else
     {
-        App::GetScriptEngine()->unloadScript(as_filename, ScriptCategory::TERRAIN);
+        App::GetScriptEngine()->unloadScript(DEFAULT_TERRAIN_SCRIPT, ScriptCategory::TERRAIN);
     }
 }
 
@@ -474,7 +481,7 @@ void TerrainManager::initScripting()
     if (!loaded)
     {
         // load a default script that does the most basic things
-        App::GetScriptEngine()->loadScript("default.as");
+        App::GetScriptEngine()->loadScript(DEFAULT_TERRAIN_SCRIPT);
     }
     // finally activate AS logging, so we dont spam the users screen with initialization messages
     App::GetScriptEngine()->activateLogging();