diff options
58 files changed, 118 insertions, 84 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 92c5c02f9..62bf23cd1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -719,8 +719,8 @@ SET(SRCS resources/db/skillunitdb.h resources/resource.cpp resources/resource.h - resources/resourcemanager.cpp - resources/resourcemanager.h + resources/resourcemanager/resourcemanager.cpp + resources/resourcemanager/resourcemanager.h resources/safeopenglimagehelper.cpp resources/safeopenglimagehelper.h resources/screenshothelper.h @@ -1409,8 +1409,8 @@ SET(DYE_CMD_SRCS resources/imagewriter.h resources/resource.cpp resources/resource.h - resources/resourcemanager.cpp - resources/resourcemanager.h + resources/resourcemanager/resourcemanager.cpp + resources/resourcemanager/resourcemanager.h resources/sdl2softwareimagehelper.cpp resources/sdl2softwareimagehelper.h resources/sdl2imagehelper.cpp diff --git a/src/Makefile.am b/src/Makefile.am index c5dfaa92b..720dd1c1d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -390,8 +390,8 @@ SRC += events/actionevent.h \ enums/resources/questtype.h \ resources/resource.cpp \ resources/resource.h \ - resources/resourcemanager.cpp \ - resources/resourcemanager.h \ + resources/resourcemanager/resourcemanager.cpp \ + resources/resourcemanager/resourcemanager.h \ resources/safeopenglimagehelper.cpp \ resources/safeopenglimagehelper.h \ resources/screenshothelper.h \ diff --git a/src/actions/actions.cpp b/src/actions/actions.cpp index 9c9cfa092..8fddb015d 100644 --- a/src/actions/actions.cpp +++ b/src/actions/actions.cpp @@ -35,6 +35,8 @@ #include "const/spells.h" +#include "const/resources/skill.h" + #include "gui/gui.h" #include "gui/popupmanager.h" #include "gui/sdlinput.h" @@ -97,9 +99,8 @@ #include "resources/iteminfo.h" #include "resources/memorymanager.h" -#include "resources/resourcemanager.h" -#include "const/resources/skill.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/chatutils.h" #include "utils/delete2.h" diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp index 6e6633ec0..adcae1cb6 100644 --- a/src/being/actorsprite.cpp +++ b/src/being/actorsprite.cpp @@ -35,14 +35,14 @@ #include "particle/particleengine.h" -#include "resources/resourcemanager.h" +#include "resources/db/statuseffectdb.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "resources/sprite/animatedsprite.h" #include "resources/sprite/imagesprite.h" #include "resources/sprite/spritereference.h" -#include "resources/db/statuseffectdb.h" - #include "utils/checkutils.h" #include "utils/delete2.h" #include "utils/timer.h" diff --git a/src/client.cpp b/src/client.cpp index 325a11a40..f1aed91fc 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -99,9 +99,6 @@ #include "particle/particleengine.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" - -#include "resources/sprite/spritereference.h" #include "resources/db/avatardb.h" #include "resources/db/badgesdb.h" @@ -125,6 +122,10 @@ #include "resources/db/statuseffectdb.h" #include "resources/db/weaponsdb.h" +#include "resources/resourcemanager/resourcemanager.h" + +#include "resources/sprite/spritereference.h" + #include "utils/cpu.h" #include "utils/delete2.h" #include "utils/env.h" diff --git a/src/dirs.cpp b/src/dirs.cpp index 79ed197bf..54f80a6a8 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -36,7 +36,7 @@ #include "utils/paths.h" #include "utils/physfstools.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #ifdef ANDROID #ifdef USE_SDL2 diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index a8f7270f0..1b78ed1bb 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -48,7 +48,8 @@ #include "gui/widgets/window.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "utils/cpu.h" #include "utils/delete2.h" diff --git a/src/dyetool/dyemain.cpp b/src/dyetool/dyemain.cpp index 8741ff9e7..3c97585c2 100644 --- a/src/dyetool/dyemain.cpp +++ b/src/dyetool/dyemain.cpp @@ -26,13 +26,14 @@ #include "resources/image.h" #include "resources/imagewriter.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" #ifdef USE_SDL2 #include "resources/surfaceimagehelper.h" #endif +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/gettext.h" #include "utils/physfstools.h" diff --git a/src/game.cpp b/src/game.cpp index 0474dad33..5af1a8a67 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -110,13 +110,14 @@ #include "resources/delayedmanager.h" #include "resources/imagewriter.h" #include "resources/mapreader.h" -#include "resources/resourcemanager.h" #include "resources/screenshothelper.h" #include "resources/db/mapdb.h" #include "resources/map/map.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sprite/animatedsprite.h" #include "utils/delete2.h" diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index cb91f09c4..a4a6a145d 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -91,7 +91,8 @@ #include "render/renderers.h" #include "resources/imageset.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "utils/delete2.h" #include "utils/langs.h" diff --git a/src/gui/models/langlistmodel.h b/src/gui/models/langlistmodel.h index 054af17ad..adbb7fe98 100644 --- a/src/gui/models/langlistmodel.h +++ b/src/gui/models/langlistmodel.h @@ -24,7 +24,7 @@ #include "gui/models/extendedlistmodel.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/gettext.h" diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 04c786b4a..619bd38db 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -39,10 +39,11 @@ #include "resources/image.h" #include "resources/iteminfo.h" -#include "resources/resourcemanager.h" #include "resources/item/item.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "net/beinghandler.h" #include "net/serverfeatures.h" diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 516fb6402..c8468a26d 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -34,10 +34,11 @@ #include "resources/image.h" #include "resources/imagerect.h" -#include "resources/resourcemanager.h" #include "resources/dye/dyepalette.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/dtor.h" #include "utils/files.h" #include "utils/physfstools.h" diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index d58953ab7..91727babe 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -42,10 +42,11 @@ #include "resources/image.h" #include "resources/imageset.h" #include "resources/iteminfo.h" -#include "resources/resourcemanager.h" #include "resources/db/itemdb.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/stringutils.h" #include "utils/timer.h" #include "utils/translation/podict.h" diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 134889ee2..701145440 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -33,9 +33,10 @@ #include "resources/image.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" #include "resources/wallpaper.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "render/graphics.h" #include "debug.h" diff --git a/src/gui/widgets/emotepage.cpp b/src/gui/widgets/emotepage.cpp index 0791c37fc..0d186e82d 100644 --- a/src/gui/widgets/emotepage.cpp +++ b/src/gui/widgets/emotepage.cpp @@ -25,7 +25,8 @@ #include "render/vertexes/imagecollection.h" #include "resources/imageset.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "utils/delete2.h" diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index 9df53b1d1..dee4ebebd 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -27,7 +27,8 @@ #include "render/graphics.h" #include "resources/image.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/gui/widgets/skilldata.cpp b/src/gui/widgets/skilldata.cpp index c3b5ca2ef..0360cd4bb 100644 --- a/src/gui/widgets/skilldata.cpp +++ b/src/gui/widgets/skilldata.cpp @@ -27,7 +27,8 @@ #include "gui/theme.h" #include "resources/image.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 200d2178c..d37e5edc7 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -49,9 +49,10 @@ #include "render/sdlgraphics.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sprite/animatedsprite.h" #include "utils/delete2.h" diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp index 8ae2fb76f..78184c671 100644 --- a/src/gui/windows/mailviewwindow.cpp +++ b/src/gui/windows/mailviewwindow.cpp @@ -40,7 +40,8 @@ #include "resources/image.h" #include "resources/iteminfo.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "resources/db/itemdb.h" diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp index 6a28e95af..e21f51742 100644 --- a/src/gui/windows/minimap.cpp +++ b/src/gui/windows/minimap.cpp @@ -40,11 +40,12 @@ #include "resources/image.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" #include "resources/map/map.h" #include "resources/map/metatile.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/gettext.h" #include "utils/physfstools.h" #include "utils/sdlcheckutils.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 7369e1314..5b573d693 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -58,7 +58,6 @@ #include "gui/widgets/scrollarea.h" #include "resources/npcdialoginfo.h" -#include "resources/resourcemanager.h" #include "resources/db/avatardb.h" #include "resources/db/npcdb.h" @@ -68,6 +67,8 @@ #include "resources/item/complexitem.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "net/npchandler.h" #include "net/packetlimiter.h" diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 66887a258..3d7e23fb3 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -38,10 +38,10 @@ #include "net/download.h" #include "net/updatetypeoperators.h" -#include "resources/resourcemanager.h" - #include "resources/db/moddb.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/delete2.h" #include "utils/files.h" #include "utils/physfstools.h" diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index 45c36b0ce..d80624afd 100644 --- a/src/integrity_unittest.cc +++ b/src/integrity_unittest.cc @@ -30,9 +30,10 @@ #include "input/inputactionmap.h" #include "input/inputmanager.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/env.h" #include "utils/physfstools.h" diff --git a/src/particle/particle.cpp b/src/particle/particle.cpp index 4d852a78d..422dbe561 100644 --- a/src/particle/particle.cpp +++ b/src/particle/particle.cpp @@ -29,12 +29,13 @@ #include "particle/rotationalparticle.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "resources/animation/simpleanimation.h" #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/delete2.h" #include "utils/dtor.h" #include "utils/mathutils.h" diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp index fccbeeced..35a1a8ddb 100644 --- a/src/particle/particleemitter.cpp +++ b/src/particle/particleemitter.cpp @@ -31,10 +31,11 @@ #include "resources/image.h" #include "resources/imageset.h" -#include "resources/resourcemanager.h" #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "debug.h" static const float SIN45 = 0.707106781F; diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp index 2f82e7704..81387a38b 100644 --- a/src/particle/particleengine.cpp +++ b/src/particle/particleengine.cpp @@ -29,10 +29,10 @@ #include "particle/rotationalparticle.h" #include "particle/textparticle.h" -#include "resources/resourcemanager.h" - #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/dtor.h" #include "debug.h" diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index 753cca93d..2138df1f5 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -33,7 +33,7 @@ #include "render/shaders/shader.h" #include "render/shaders/shaderprogram.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/files.h" diff --git a/src/resources/ambientlayer.cpp b/src/resources/ambientlayer.cpp index 3decec879..6c8e22893 100644 --- a/src/resources/ambientlayer.cpp +++ b/src/resources/ambientlayer.cpp @@ -27,7 +27,8 @@ #include "resources/image.h" #include "resources/imagehelper.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/resources/animation/simpleanimation.cpp b/src/resources/animation/simpleanimation.cpp index 8f0bfba0b..bc67ad747 100644 --- a/src/resources/animation/simpleanimation.cpp +++ b/src/resources/animation/simpleanimation.cpp @@ -27,12 +27,13 @@ #include "render/graphics.h" #include "resources/imageset.h" -#include "resources/resourcemanager.h" #include "resources/animation/animation.h" #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/delete2.h" #include "debug.h" diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index 03d0b40fd..7a375b243 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -35,7 +35,6 @@ #include "resources/imagehelper.h" #include "resources/openglimagehelper.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" #include "resources/atlas/atlasitem.h" @@ -44,6 +43,8 @@ #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "debug.h" AtlasManager::AtlasManager() diff --git a/src/resources/atlas/atlasresource.cpp b/src/resources/atlas/atlasresource.cpp index 48561bbbc..5f2e24160 100644 --- a/src/resources/atlas/atlasresource.cpp +++ b/src/resources/atlas/atlasresource.cpp @@ -22,12 +22,12 @@ #include "resources/atlas/atlasresource.h" -#include "resources/resourcemanager.h" - #include "resources/atlas/atlasitem.h" #include "resources/atlas/atlasmanager.h" #include "resources/atlas/textureatlas.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "debug.h" AtlasResource::~AtlasResource() diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc index cda902697..9bf8bbeb0 100644 --- a/src/resources/dye/dyepalette_unittest.cc +++ b/src/resources/dye/dyepalette_unittest.cc @@ -25,13 +25,14 @@ #include "logger.h" #include "graphicsmanager.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" #include "resources/db/palettedb.h" #include "resources/dye/dyepalette.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/env.h" #include "utils/physfstools.h" #include "utils/xml.h" diff --git a/src/resources/image.cpp b/src/resources/image.cpp index c4bbf0a3c..26322aed9 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -22,17 +22,18 @@ #include "resources/image.h" -#include "resources/resourcemanager.h" - #include "logger.h" #ifdef USE_OPENGL #include "resources/openglimagehelper.h" #endif // USE_OPENGL + #include "resources/memorymanager.h" #include "resources/sdlimagehelper.h" #include "resources/subimage.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/sdlcheckutils.h" #ifdef USE_SDL2 diff --git a/src/resources/item/item.cpp b/src/resources/item/item.cpp index f6d0af1d9..d62d9aaf1 100644 --- a/src/resources/item/item.cpp +++ b/src/resources/item/item.cpp @@ -29,7 +29,8 @@ #include "gui/theme.h" #include "resources/iteminfo.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "net/serverfeatures.h" diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp index ee4e0dc59..7fde6a005 100644 --- a/src/resources/map/map.cpp +++ b/src/resources/map/map.cpp @@ -46,13 +46,14 @@ #include "particle/particle.h" #include "resources/ambientlayer.h" -#include "resources/resourcemanager.h" #include "resources/subimage.h" #include "resources/map/location.h" #include "resources/map/mapobjectlist.h" #include "resources/map/tileanimation.h" +#include "resources/resourcemanager/resourcemanager.h" + #ifdef USE_OPENGL #include "render/renderers.h" #endif diff --git a/src/resources/map/mapitem.cpp b/src/resources/map/mapitem.cpp index 2968123a9..58a105ab9 100644 --- a/src/resources/map/mapitem.cpp +++ b/src/resources/map/mapitem.cpp @@ -28,7 +28,8 @@ #include "gui/fonts/font.h" #include "resources/image.h" -#include "resources/resourcemanager.h" + +#include "resources/resourcemanager/resourcemanager.h" #include "render/graphics.h" diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index b5cad0661..979153c87 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -38,8 +38,6 @@ #include "resources/beingcommon.h" #include "resources/image.h" -#include "resources/resourcemanager.h" - #include "resources/animation/animation.h" #ifdef USE_OPENGL @@ -48,6 +46,8 @@ #include "resources/map/tileanimation.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/base64.h" #include "utils/delete2.h" #include "utils/physfstools.h" diff --git a/src/resources/memorymanager.cpp b/src/resources/memorymanager.cpp index 11fd40f4e..33d6f442e 100644 --- a/src/resources/memorymanager.cpp +++ b/src/resources/memorymanager.cpp @@ -22,7 +22,7 @@ #include "gui/widgets/tabs/chat/chattab.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/gettext.h" #include "utils/stringutils.h" diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp index 959298290..391e0ce1b 100644 --- a/src/resources/resource.cpp +++ b/src/resources/resource.cpp @@ -24,7 +24,7 @@ #include "logger.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager/resourcemanager.cpp index 8057acfba..c59b09618 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager/resourcemanager.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "configuration.h" #include "logger.h" diff --git a/src/resources/resourcemanager.h b/src/resources/resourcemanager/resourcemanager.h index eeda43b33..2c2caabce 100644 --- a/src/resources/resourcemanager.h +++ b/src/resources/resourcemanager/resourcemanager.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RESOURCES_RESOURCEMANAGER_H -#define RESOURCES_RESOURCEMANAGER_H +#ifndef RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H +#define RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H #include "resources/memorycounter.h" @@ -274,4 +274,4 @@ class ResourceManager final : public MemoryCounter extern ResourceManager *resourceManager; -#endif // RESOURCES_RESOURCEMANAGER_H +#endif // RESOURCES_RESOURCEMANAGER_RESOURCEMANAGER_H diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp index 9cca68e21..9bd66c3e4 100644 --- a/src/resources/sdl2imagehelper.cpp +++ b/src/resources/sdl2imagehelper.cpp @@ -24,16 +24,16 @@ #include "resources/sdl2imagehelper.h" -#include "resources/resourcemanager.h" - -#include "resources/dye/dye.h" -#include "resources/dye/dyepalette.h" - #include "logger.h" #include "main.h" #include "resources/image.h" +#include "resources/dye/dye.h" +#include "resources/dye/dyepalette.h" + +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/sdlcheckutils.h" #include <SDL_image.h> diff --git a/src/resources/sdl2softwareimagehelper.cpp b/src/resources/sdl2softwareimagehelper.cpp index 5b9ffce14..375f08cc5 100644 --- a/src/resources/sdl2softwareimagehelper.cpp +++ b/src/resources/sdl2softwareimagehelper.cpp @@ -24,15 +24,15 @@ #include "resources/sdl2softwareimagehelper.h" -#include "resources/resourcemanager.h" - -#include "resources/dye/dye.h" - #include "logger.h" #include "main.h" +#include "resources/dye/dye.h" + #include "resources/image.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/sdlcheckutils.h" #include <SDL_image.h> diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index 87fe72a7b..6ada9c394 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -29,10 +29,11 @@ #include "resources/action.h" #include "resources/delayedmanager.h" #include "resources/image.h" -#include "resources/resourcemanager.h" #include "resources/animation/animation.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sprite/animationdelayload.h" #include "utils/delete2.h" diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc index f9b6e65a9..1a77ea38f 100644 --- a/src/resources/sprite/animatedsprite_unittest.cc +++ b/src/resources/sprite/animatedsprite_unittest.cc @@ -30,11 +30,12 @@ #include "gui/theme.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" #include "resources/animation/animation.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/env.h" #include "utils/mrand.h" #include "utils/physfstools.h" diff --git a/src/resources/sprite/animationdelayload.cpp b/src/resources/sprite/animationdelayload.cpp index ab0362337..fa33ff5f5 100644 --- a/src/resources/sprite/animationdelayload.cpp +++ b/src/resources/sprite/animationdelayload.cpp @@ -22,7 +22,7 @@ #include "const/resources/spriteaction.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "resources/sprite/animatedsprite.h" diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp index 01651bd80..25c5952e3 100644 --- a/src/resources/sprite/spritedef.cpp +++ b/src/resources/sprite/spritedef.cpp @@ -34,12 +34,13 @@ #include "resources/action.h" #include "resources/imageset.h" -#include "resources/resourcemanager.h" #include "resources/animation/animation.h" #include "resources/dye/dye.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sprite/spritereference.h" #include "debug.h" diff --git a/src/resources/surfaceimagehelper.cpp b/src/resources/surfaceimagehelper.cpp index 69e011219..effba4abd 100644 --- a/src/resources/surfaceimagehelper.cpp +++ b/src/resources/surfaceimagehelper.cpp @@ -24,15 +24,15 @@ #include "resources/surfaceimagehelper.h" -#include "resources/resourcemanager.h" - -#include "resources/dye/dye.h" - #include "logger.h" #include "main.h" #include "resources/image.h" +#include "resources/dye/dye.h" + +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/sdlcheckutils.h" #include <SDL_image.h> diff --git a/src/soundmanager.cpp b/src/soundmanager.cpp index 45490d497..b48923d2f 100644 --- a/src/soundmanager.cpp +++ b/src/soundmanager.cpp @@ -30,9 +30,10 @@ #endif #include "resources/sdlmusic.h" -#include "resources/resourcemanager.h" #include "resources/soundeffect.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "utils/checkutils.h" #include "utils/physfstools.h" diff --git a/src/textcommand.cpp b/src/textcommand.cpp index c7ec01d0f..9fabb4572 100644 --- a/src/textcommand.cpp +++ b/src/textcommand.cpp @@ -28,10 +28,11 @@ #include "resources/image.h" #include "resources/iteminfo.h" -#include "resources/resourcemanager.h" #include "resources/db/itemdb.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "debug.h" #ifdef TMWA_SUPPORT diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index 33c4ca286..af4cb388a 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -33,9 +33,10 @@ #include "utils/delete2.h" #include "utils/physfstools.h" -#include "resources/resourcemanager.h" #include "resources/sdlimagehelper.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "debug.h" TEST_CASE("chatutils replaceVars") diff --git a/src/utils/files.cpp b/src/utils/files.cpp index ae56c70da..f5bd8c557 100644 --- a/src/utils/files.cpp +++ b/src/utils/files.cpp @@ -23,7 +23,7 @@ #include "logger.h" #if defined(ANDROID) || defined(__native_client__) -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/mkdir.h" #endif diff --git a/src/utils/files_unittest.cc b/src/utils/files_unittest.cc index c876e2b72..5ccfe0e04 100644 --- a/src/utils/files_unittest.cc +++ b/src/utils/files_unittest.cc @@ -25,7 +25,7 @@ #include "utils/physfstools.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index a219346b2..2490c853d 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -31,7 +31,7 @@ #include "utils/stringutils.h" #ifdef USE_X11 -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #endif #ifdef __native_client__ diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc index 1e1b527c1..0fcf2bae5 100644 --- a/src/utils/translation/poparser_unittest.cc +++ b/src/utils/translation/poparser_unittest.cc @@ -25,7 +25,7 @@ #include "utils/translation/podict.h" #include "utils/translation/poparser.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "utils/physfstools.h" diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc index 7c4f12222..e2f68181e 100644 --- a/src/utils/xml_unittest.cc +++ b/src/utils/xml_unittest.cc @@ -25,7 +25,7 @@ #include "utils/physfstools.h" #include "utils/xml.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc index 1a0f303ff..4e78d0b0e 100644 --- a/src/utils/xmlutils_unittest.cc +++ b/src/utils/xmlutils_unittest.cc @@ -27,7 +27,7 @@ #include "utils/physfstools.h" #include "utils/xml.h" -#include "resources/resourcemanager.h" +#include "resources/resourcemanager/resourcemanager.h" #include "debug.h" |