Unloading CLEO plugins.

cleo_plugins/Audio/CSoundSystem.cpp

@@ -46,6 +46,7 @@ namespace CLEO
 
     CSoundSystem::~CSoundSystem()
     {
+        TRACE(""); // seaprator
         TRACE("Finalizing SoundSystem...");
         Clear();
 

source/CCustomOpcodeSystem.h

@@ -38,8 +38,10 @@ namespace CLEO
         void Init();
         ~CCustomOpcodeSystem()
         {
-            TRACE("Last opcode executed: %04X", lastOpcode);
-            TRACE("Previous opcode executed: %04X", prevOpcode);
+            TRACE(""); // separator
+            TRACE("Custom Opcode System finalized:");
+            TRACE(" Last opcode executed: %04X", lastOpcode);
+            TRACE(" Previous opcode executed: %04X", prevOpcode);
         }
 
         static bool RegisterOpcode(WORD opcode, CustomOpcodeHandler callback);

source/CDebug.h

@@ -24,6 +24,7 @@ class CDebug
 
     ~CDebug()
     {
+        CLEO::Trace(CLEO::eLogLevel::Default, ""); // separator
         CLEO::Trace(CLEO::eLogLevel::Default, "Log finished.");
     }
 

source/CPluginSystem.cpp

@@ -7,7 +7,7 @@ using namespace CLEO;
 
 CPluginSystem::~CPluginSystem()
 {
-    std::for_each(plugins.begin(), plugins.end(), FreeLibrary);
+    UnloadPlugins();
 }
 
 void CPluginSystem::LoadPlugins()
@@ -79,7 +79,7 @@ void CPluginSystem::LoadPlugins()
                 continue;
             }
 
-            plugins.push_back(hlib);
+            plugins.emplace_back(filename, hlib);
         }
         TRACE(""); // separator
     }
@@ -91,6 +91,23 @@ void CPluginSystem::LoadPlugins()
     pluginsLoaded = true;
 }
 
+void CPluginSystem::UnloadPlugins()
+{
+    if (!pluginsLoaded) return;
+
+    TRACE(""); // separator
+    TRACE("Unloading CLEO plugins:");
+    for (const auto& plugin : plugins)
+    {
+        TRACE(" - Unloading '%s' at 0x%08X", plugin.name.c_str(), plugin.handle);
+        FreeLibrary(plugin.handle);
+    }
+    TRACE("CLEO plugins unloaded");
+
+    plugins.clear();
+    pluginsLoaded = false;
+}
+
 size_t CPluginSystem::GetNumPlugins() const
 {
     return plugins.size();

source/CPluginSystem.h

@@ -2,16 +2,24 @@
 #include "FileEnumerator.h"
 #include "CDebug.h"
 #include <windows.h>
-#include <algorithm>
 #include <list>
+#include <string>
 #include <CMenuSystem.h>
 
 
 namespace CLEO
 {
     class CPluginSystem
     {
-        std::list<HMODULE> plugins;
+        struct PluginEntry
+        {
+            std::string name;
+            HMODULE handle = nullptr;
+
+            PluginEntry() = default;
+            PluginEntry(std::string name, HMODULE handle) : name(name), handle(handle) {}
+        };
+        std::list<PluginEntry> plugins;
         bool pluginsLoaded = false;
 
     public:
@@ -20,6 +28,7 @@ namespace CLEO
         ~CPluginSystem();
 
         void LoadPlugins();
+        void UnloadPlugins();
         size_t GetNumPlugins() const;
     };
 }

source/CScriptEngine.cpp

@@ -994,6 +994,7 @@ namespace CLEO
 
     void CScriptEngine::LoadCustomScripts()
     {
+        TRACE(""); // separator
         TRACE("Listing CLEO scripts:");
 
         std::set<std::string> found;

source/CleoBase.cpp

@@ -155,6 +155,8 @@ namespace CLEO
         m_bStarted = false;
 
         ScriptEngine.GameEnd();
+
+        PluginSystem.UnloadPlugins();
     }
 
     void CCleoInstance::GameBegin()