From 9215e80db6b4fd014dc93145b198894abb43ee42 Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 23 Jun 2016 00:37:32 +0200 Subject: [PATCH] Core/PluginManager: Fix usage of Mount(Plugin) Former-commit-id: b1e02a118828724f83be8830e4f0c8966558d0fa [formerly a1c537e8962a75da319c127e8b9bc27109a595bb] Former-commit-id: 6e706993915981df3b77ae7ae1c9139eb5d97ac4 --- src/Nazara/Core/PluginManager.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Nazara/Core/PluginManager.cpp b/src/Nazara/Core/PluginManager.cpp index 24fbafcfb..b71af6677 100644 --- a/src/Nazara/Core/PluginManager.cpp +++ b/src/Nazara/Core/PluginManager.cpp @@ -19,8 +19,7 @@ namespace Nz String s_pluginFiles[] = { - "NazaraAssimp", // Plugin_Assimp - "NazaraFreetype" // Plugin_FreeType + "PluginAssimp", // Plugin_Assimp }; } @@ -80,7 +79,13 @@ namespace Nz bool PluginManager::Mount(Plugin plugin) { - return Mount(s_pluginFiles[plugin]); + Nz::String pluginName = s_pluginFiles[plugin]; + #ifdef NAZARA_DEBUG + if (Mount(pluginName + "-d", true)) + return true; + #endif + + return Mount(pluginName, true); } /*!