diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-01 04:05:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-01 04:05:51 +0300 |
| commit | 59d9b799fa5bf3c8ba99cc6f703b83751f1d3497 (patch) | |
| tree | 16b29e2afda9f223f36e6a7d3f4659fb72d3d7e6 /src/unittests/resources/resourcemanager | |
| parent | b9ce7a70632f31a3a4b29841ab034dbb297b295d (diff) | |
| download | manaplus-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.gz manaplus-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.bz2 manaplus-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.xz manaplus-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.zip | |
Fix unit tests after last changes in configuration.cpp
Diffstat (limited to 'src/unittests/resources/resourcemanager')
| -rw-r--r-- | src/unittests/resources/resourcemanager/resourcemanager.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/unittests/resources/resourcemanager/resourcemanager.cc b/src/unittests/resources/resourcemanager/resourcemanager.cc index d035faafb..66656558b 100644 --- a/src/unittests/resources/resourcemanager/resourcemanager.cc +++ b/src/unittests/resources/resourcemanager/resourcemanager.cc @@ -21,6 +21,8 @@ #include "unittests/unittests.h" #include "client.h" +#include "configmanager.h" +#include "configuration.h" #include "dirs.h" #include "graphicsmanager.h" @@ -110,12 +112,16 @@ TEST_CASE("resourcemanager", "resourcemanager") #endif // USE_SDL2 userPalette = new UserPalette; - theme = new Theme; - Theme::selectSkin(); Dirs::initRootDir(); Dirs::initHomeDir(); + setBrandingDefaults(branding); + ConfigManager::initConfiguration(); + + theme = new Theme; + Theme::selectSkin(); + ActorSprite::load(); // ConfigManager::initConfiguration(); |