Move resourcemanager from class to namespace.

2 files changed, 19 insertions, 2 deletions

diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index 960a5ea00..3e9250e13 100644
--- a/src/resources/sprite/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -90,7 +90,7 @@ AnimatedSprite *AnimatedSprite::delayedLoad(const std::string &restrict
 {
     if (!mEnableCache)
         return load(filename, variant);
-    Resource *restrict const res = resourceManager->getFromCache(
+    Resource *restrict const res = ResourceManager::getFromCache(
         filename, variant);
     if (res)
     {
diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc
index d17177a6d..f48b10b4b 100644
--- a/src/resources/sprite/animatedsprite_unittest.cc
+++ b/src/resources/sprite/animatedsprite_unittest.cc
@@ -54,6 +54,15 @@
 
 #include "debug.h"
 
+TEST_CASE("AnimatedSprite leak test1")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
+
 TEST_CASE("AnimatedSprite tests", "animatedsprite")
 {
     setEnv("SDL_VIDEODRIVER", "dummy");
@@ -63,7 +72,6 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
     XML::initXML();
     SDL_Init(SDL_INIT_VIDEO);
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
     mainGraphics = new SDLGraphics;
@@ -196,3 +204,12 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
     delete2(logger);
 //    VirtFs::deinit();
 }
+
+TEST_CASE("AnimatedSprite leak test2")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}