From 245fb04a1e112cc8d0918a8660474299d5ce223c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Feb 2017 19:08:11 +0300 Subject: Split virtfs api for add directories and archives. Also remove useless resourcemanager functions for add/remove virtfs entries. --- src/resources/map/maplayer_unittest.cc | 14 ++++++++------ src/resources/map/speciallayer_unittest.cc | 9 +++++---- 2 files changed, 13 insertions(+), 10 deletions(-) (limited to 'src/resources/map') diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc index bd58d998c..75bd20219 100644 --- a/src/resources/map/maplayer_unittest.cc +++ b/src/resources/map/maplayer_unittest.cc @@ -28,6 +28,8 @@ #include "gui/theme.h" +#include "utils/virtfs.h" + #include "render/mockgraphics.h" #include "resources/sdlimagehelper.h" @@ -1645,8 +1647,8 @@ TEST_CASE("MapLayer draw") TEST_CASE("MapLayer drawSpecialLayer (specialLayer)") { ResourceManager::init(); - resourceManager->addToSearchPath("data", Append_false); - resourceManager->addToSearchPath("../data", Append_false); + VirtFs::addDirToSearchPath("data", Append_false); + VirtFs::addDirToSearchPath("../data", Append_false); imageHelper = new SDLImageHelper; #ifdef USE_SDL2 @@ -1993,8 +1995,8 @@ TEST_CASE("MapLayer drawSpecialLayer (specialLayer)") TEST_CASE("MapLayer drawSpecialLayer (tempLayer)") { ResourceManager::init(); - resourceManager->addToSearchPath("data", Append_false); - resourceManager->addToSearchPath("../data", Append_false); + VirtFs::addDirToSearchPath("data", Append_false); + VirtFs::addDirToSearchPath("../data", Append_false); imageHelper = new SDLImageHelper; #ifdef USE_SDL2 @@ -2347,8 +2349,8 @@ TEST_CASE("MapLayer drawSpecialLayer (tempLayer)") TEST_CASE("MapLayer drawFringe") { ResourceManager::init(); - resourceManager->addToSearchPath("data", Append_false); - resourceManager->addToSearchPath("../data", Append_false); + VirtFs::addDirToSearchPath("data", Append_false); + VirtFs::addDirToSearchPath("../data", Append_false); logger = new Logger; imageHelper = new SDLImageHelper; diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc index b74ade7dc..6c6772332 100644 --- a/src/resources/map/speciallayer_unittest.cc +++ b/src/resources/map/speciallayer_unittest.cc @@ -27,22 +27,23 @@ #include "enums/resources/map/mapitemtype.h" +#include "utils/delete2.h" +#include "utils/virtfs.h" + #include "resources/sdlimagehelper.h" #include "resources/map/speciallayer.h" #include "resources/resourcemanager/resourcemanager.h" -#include "utils/delete2.h" - #include "debug.h" TEST_CASE("SpecialLayer updateCache") { client = new Client; ResourceManager::init(); - resourceManager->addToSearchPath("data", Append_false); - resourceManager->addToSearchPath("../data", Append_false); + VirtFs::addDirToSearchPath("data", Append_false); + VirtFs::addDirToSearchPath("../data", Append_false); imageHelper = new SDLImageHelper; #ifdef USE_SDL2 -- cgit v1.2.3-70-g09d2