Update manaplus.cbp.

1 files changed, 88 insertions, 72 deletions

diff --git a/manaplus.cbp b/manaplus.cbp
index dd0ccf6b9..08edecd2a 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -91,6 +91,11 @@
 		<Unit filename="src/gui/fonts/font.cpp" />
 		<Unit filename="src/gui/fonts/textchunk.cpp" />
 		<Unit filename="src/gui/fonts/textchunksmall.cpp" />
+		<Unit filename="src/gui/shortcut/dropshortcut.cpp" />
+		<Unit filename="src/gui/shortcut/itemshortcut.cpp" />
+		<Unit filename="src/gui/shortcut/emoteshortcut.cpp" />
+		<Unit filename="src/gui/shortcut/spellshortcut.cpp" />
+		<Unit filename="src/gui/shortcut/shortcutbase.cpp" />
 		<Unit filename="src/gui/themecolorsidoperators.cpp" />
 		<Unit filename="src/gui/setupinputpages.cpp" />
 		<Unit filename="src/gui/focushandler.cpp" />
@@ -447,7 +452,6 @@
 		<Unit filename="src/soundmanager.cpp" />
 		<Unit filename="src/configmanager.cpp" />
 		<Unit filename="src/vector.cpp" />
-		<Unit filename="src/shopitem.cpp" />
 		<Unit filename="src/position.cpp" />
 		<Unit filename="src/being/being.cpp" />
 		<Unit filename="src/being/playerrelations.cpp" />
@@ -456,6 +460,7 @@
 		<Unit filename="src/being/localplayer.cpp" />
 		<Unit filename="src/being/playerinfo.cpp" />
 		<Unit filename="src/being/actor.cpp" />
+		<Unit filename="src/being/flooritem.cpp" />
 		<Unit filename="src/being/compoundsprite.cpp" />
 		<Unit filename="src/being/actorsprite.cpp" />
 		<Unit filename="src/party.cpp" />
@@ -472,15 +477,18 @@
 		<Unit filename="src/input/pages/windows.cpp" />
 		<Unit filename="src/input/pages/gui.cpp" />
 		<Unit filename="src/input/pages/outfits.cpp" />
+		<Unit filename="src/input/touch/multitouchmanager.cpp" />
+		<Unit filename="src/input/touch/touchmanager.cpp" />
+		<Unit filename="src/input/touch/touchactions.cpp" />
 		<Unit filename="src/input/inputmanager.cpp" />
-		<Unit filename="src/input/multitouchmanager.cpp" />
 		<Unit filename="src/input/inputactionoperators.cpp" />
 		<Unit filename="src/input/keyboardconfig.cpp" />
-		<Unit filename="src/dropshortcut.cpp" />
 		<Unit filename="src/statuseffect.cpp" />
+		<Unit filename="src/utils/xml/pugixmlwriter.cpp" />
+		<Unit filename="src/utils/xml/pugixml.cpp" />
+		<Unit filename="src/utils/xml/libxml.cpp" />
 		<Unit filename="src/utils/files.cpp" />
 		<Unit filename="src/utils/cpu.cpp" />
-		<Unit filename="src/utils/xml.cpp" />
 		<Unit filename="src/utils/mkdir.cpp" />
 		<Unit filename="src/utils/perfomance.cpp" />
 		<Unit filename="src/utils/physfsrwops.cpp" />
@@ -510,17 +518,14 @@
 		<Unit filename="src/utils/specialfolder.cpp" />
 		<Unit filename="src/utils/langs.cpp" />
 		<Unit filename="src/notifymanager.cpp" />
-		<Unit filename="src/itemshortcut.cpp" />
 		<Unit filename="src/avatar.cpp" />
 		<Unit filename="src/defaults.cpp" />
-		<Unit filename="src/inventory.cpp" />
 		<Unit filename="src/textmanager.cpp" />
 		<Unit filename="src/gamemodifiers.cpp" />
 		<Unit filename="src/navigationmanager.cpp" />
 		<Unit filename="src/dirs.cpp" />
 		<Unit filename="src/eventsmanager.cpp" />
 		<Unit filename="src/effectmanager.cpp" />
-		<Unit filename="src/animationdelayload.cpp" />
 		<Unit filename="src/chatlogger.cpp" />
 		<Unit filename="src/itemcolormanager.cpp" />
 		<Unit filename="src/main.cpp" />
@@ -537,11 +542,8 @@
 		<Unit filename="src/units.cpp" />
 		<Unit filename="src/text.cpp" />
 		<Unit filename="src/mumblemanager.cpp" />
-		<Unit filename="src/simpleanimation.cpp" />
 		<Unit filename="src/guild.cpp" />
-		<Unit filename="src/touchmanager.cpp" />
 		<Unit filename="src/logger.cpp" />
-		<Unit filename="src/emoteshortcut.cpp" />
 		<Unit filename="src/actions/commands.cpp" />
 		<Unit filename="src/actions/chat.cpp" />
 		<Unit filename="src/actions/target.cpp" />
@@ -553,24 +555,24 @@
 		<Unit filename="src/actions/pets.cpp" />
 		<Unit filename="src/configuration.cpp" />
 		<Unit filename="src/graphicsvertexes.cpp" />
+		<Unit filename="src/render/nacl/naclgles.cpp" />
 		<Unit filename="src/render/nullopenglgraphics.cpp" />
-		<Unit filename="src/render/mglemu.cpp" />
 		<Unit filename="src/render/modernopenglgraphics.cpp" />
 		<Unit filename="src/render/surfacegraphics.cpp" />
-		<Unit filename="src/render/naclgles.cpp" />
-		<Unit filename="src/render/mglxinit.cpp" />
 		<Unit filename="src/render/shaders/shadersmanager.cpp" />
 		<Unit filename="src/render/shaders/shader.cpp" />
 		<Unit filename="src/render/shaders/shaderprogram.cpp" />
-		<Unit filename="src/render/mglx.cpp" />
 		<Unit filename="src/render/imagegraphics.cpp" />
-		<Unit filename="src/render/mgl.cpp" />
 		<Unit filename="src/render/normalopenglgraphics.cpp" />
 		<Unit filename="src/render/renderers.cpp" />
 		<Unit filename="src/render/sdl2softwaregraphics.cpp" />
+		<Unit filename="src/render/opengl/mglemu.cpp" />
+		<Unit filename="src/render/opengl/mgl.cpp" />
 		<Unit filename="src/render/sdlgraphics.cpp" />
 		<Unit filename="src/render/mobileopenglgraphics.cpp" />
 		<Unit filename="src/render/sdl2graphics.cpp" />
+		<Unit filename="src/render/openglx/mglxinit.cpp" />
+		<Unit filename="src/render/openglx/mglx.cpp" />
 		<Unit filename="src/render/mobileopengl2graphics.cpp" />
 		<Unit filename="src/render/graphics.cpp" />
 		<Unit filename="src/render/safeopenglgraphics.cpp" />
@@ -602,11 +604,8 @@
 		<Unit filename="src/listeners/statlistener.cpp" />
 		<Unit filename="src/listeners/arrowslistener.cpp" />
 		<Unit filename="src/listeners/vendingmodelistener.cpp" />
-		<Unit filename="src/item.cpp" />
-		<Unit filename="src/imagesprite.cpp" />
 		<Unit filename="src/spellmanager.cpp" />
 		<Unit filename="src/actormanager.cpp" />
-		<Unit filename="src/touchactions.cpp" />
 		<Unit filename="src/resources/db/emotedb.cpp" />
 		<Unit filename="src/resources/db/commandsdb.cpp" />
 		<Unit filename="src/resources/db/badgesdb.cpp" />
@@ -628,6 +627,8 @@
 		<Unit filename="src/resources/db/deaddb.cpp" />
 		<Unit filename="src/resources/db/horsedb.cpp" />
 		<Unit filename="src/resources/db/palettedb.cpp" />
+		<Unit filename="src/resources/dye/dyepalette.cpp" />
+		<Unit filename="src/resources/dye/dye.cpp" />
 		<Unit filename="src/resources/map/tileanimation.cpp" />
 		<Unit filename="src/resources/map/walklayer.cpp" />
 		<Unit filename="src/resources/map/mapitem.cpp" />
@@ -637,29 +638,35 @@
 		<Unit filename="src/resources/map/mapheights.cpp" />
 		<Unit filename="src/resources/map/maplayer.cpp" />
 		<Unit filename="src/resources/imageset.cpp" />
+		<Unit filename="src/resources/item/shopitem.cpp" />
+		<Unit filename="src/resources/item/item.cpp" />
+		<Unit filename="src/resources/item/complexitem.cpp" />
 		<Unit filename="src/resources/soundeffect.cpp" />
 		<Unit filename="src/resources/mobileopenglscreenshothelper.cpp" />
 		<Unit filename="src/resources/iteminfo.cpp" />
-		<Unit filename="src/resources/atlasmanager.cpp" />
 		<Unit filename="src/resources/safeopenglimagehelper.cpp" />
+		<Unit filename="src/resources/atlas/atlasmanager.cpp" />
+		<Unit filename="src/resources/atlas/atlasresource.cpp" />
 		<Unit filename="src/resources/resource.cpp" />
-		<Unit filename="src/resources/dyepalette.cpp" />
 		<Unit filename="src/resources/chatobject.cpp" />
 		<Unit filename="src/resources/surfaceimagehelper.cpp" />
+		<Unit filename="src/resources/inventory/inventory.cpp" />
+		<Unit filename="src/resources/inventory/complexinventory.cpp" />
 		<Unit filename="src/resources/beinginfo.cpp" />
 		<Unit filename="src/resources/mapreader.cpp" />
-		<Unit filename="src/resources/dye.cpp" />
 		<Unit filename="src/resources/action.cpp" />
 		<Unit filename="src/resources/wallpaper.cpp" />
 		<Unit filename="src/resources/cursor.cpp" />
-		<Unit filename="src/resources/animation.cpp" />
-		<Unit filename="src/resources/atlasresource.cpp" />
 		<Unit filename="src/resources/sdlscreenshothelper.cpp" />
 		<Unit filename="src/resources/openglscreenshothelper.cpp" />
 		<Unit filename="src/resources/sdlimagehelper.cpp" />
 		<Unit filename="src/resources/image.cpp" />
 		<Unit filename="src/resources/beingcommon.cpp" />
 		<Unit filename="src/resources/sdl2imagehelper.cpp" />
+		<Unit filename="src/resources/sprite/animationdelayload.cpp" />
+		<Unit filename="src/resources/sprite/imagesprite.cpp" />
+		<Unit filename="src/resources/sprite/animatedsprite.cpp" />
+		<Unit filename="src/resources/sprite/spritedef.cpp" />
 		<Unit filename="src/resources/delayedmanager.cpp" />
 		<Unit filename="src/resources/resourcemanager.cpp" />
 		<Unit filename="src/resources/imagehelper.cpp" />
@@ -667,17 +674,14 @@
 		<Unit filename="src/resources/imagewriter.cpp" />
 		<Unit filename="src/resources/sdlmusic.cpp" />
 		<Unit filename="src/resources/ambientlayer.cpp" />
+		<Unit filename="src/resources/animation/animation.cpp" />
+		<Unit filename="src/resources/animation/simpleanimation.cpp" />
 		<Unit filename="src/resources/modinfo.cpp" />
 		<Unit filename="src/resources/subimage.cpp" />
 		<Unit filename="src/resources/sdl2softwareimagehelper.cpp" />
 		<Unit filename="src/resources/sdl2softwarescreenshothelper.cpp" />
-		<Unit filename="src/resources/spritedef.cpp" />
 		<Unit filename="src/game.cpp" />
 		<Unit filename="src/graphicsmanager.cpp" />
-		<Unit filename="src/animatedsprite.cpp" />
-		<Unit filename="src/spellshortcut.cpp" />
-		<Unit filename="src/shortcutbase.cpp" />
-		<Unit filename="src/flooritem.cpp" />
 		<Unit filename="src/commandline.cpp" />
 		<Unit filename="src/itemsoundmanager.cpp" />
 		<Unit filename="src/beingequipbackend.cpp" />
@@ -691,6 +695,11 @@
 		<Unit filename="src/gui/fonts/textchunksmall.h" />
 		<Unit filename="src/gui/fonts/textchunk.h" />
 		<Unit filename="src/gui/gui.h" />
+		<Unit filename="src/gui/shortcut/emoteshortcut.h" />
+		<Unit filename="src/gui/shortcut/dropshortcut.h" />
+		<Unit filename="src/gui/shortcut/itemshortcut.h" />
+		<Unit filename="src/gui/shortcut/spellshortcut.h" />
+		<Unit filename="src/gui/shortcut/shortcutbase.h" />
 		<Unit filename="src/gui/userpalette.h" />
 		<Unit filename="src/gui/windowmenu.h" />
 		<Unit filename="src/gui/setupinputpages.h" />
@@ -1158,9 +1167,7 @@
 		<Unit filename="src/net/battlegroundhandler.h" />
 		<Unit filename="src/test/testmain.h" />
 		<Unit filename="src/test/testlauncher.h" />
-		<Unit filename="src/touchmanager.h" />
 		<Unit filename="src/debug.h" />
-		<Unit filename="src/simpleanimation.h" />
 		<Unit filename="src/sdlshared.h" />
 		<Unit filename="src/effectmanager.h" />
 		<Unit filename="src/navigationmanager.h" />
@@ -1172,6 +1179,7 @@
 		<Unit filename="src/being/playerignorestrategy.h" />
 		<Unit filename="src/being/compoundsprite.h" />
 		<Unit filename="src/being/mercenaryinfo.h" />
+		<Unit filename="src/being/flooritem.h" />
 		<Unit filename="src/being/compounditem.h" />
 		<Unit filename="src/being/actor.h" />
 		<Unit filename="src/being/beingspeech.h" />
@@ -1197,7 +1205,9 @@
 		<Unit filename="src/const/render/graphics.h" />
 		<Unit filename="src/const/equipment.h" />
 		<Unit filename="src/const/resources/map/map.h" />
+		<Unit filename="src/const/resources/item/cards.h" />
 		<Unit filename="src/const/resources/skill.h" />
+		<Unit filename="src/const/resources/spriteaction.h" />
 		<Unit filename="src/enums/gui/chatmsgtype.h" />
 		<Unit filename="src/enums/gui/usercolorid.h" />
 		<Unit filename="src/enums/gui/themecolorid.h" />
@@ -1229,9 +1239,14 @@
 		<Unit filename="src/enums/being/reachable.h" />
 		<Unit filename="src/enums/being/badgeindex.h" />
 		<Unit filename="src/enums/being/relation.h" />
+		<Unit filename="src/enums/input/inputgroup.h" />
 		<Unit filename="src/enums/input/inputaction.h" />
+		<Unit filename="src/enums/input/inputcondition.h" />
+		<Unit filename="src/enums/input/keyvalue.h" />
 		<Unit filename="src/enums/input/inputtype.h" />
 		<Unit filename="src/enums/screendensity.h" />
+		<Unit filename="src/enums/particle/alivestatus.h" />
+		<Unit filename="src/enums/particle/particlechangefunc.h" />
 		<Unit filename="src/enums/state.h" />
 		<Unit filename="src/enums/guildpositionflags.h" />
 		<Unit filename="src/enums/events/mousebutton.h" />
@@ -1248,6 +1263,8 @@
 		<Unit filename="src/enums/resources/notifyflags.h" />
 		<Unit filename="src/enums/resources/itemsoundevent.h" />
 		<Unit filename="src/enums/resources/notifytypes.h" />
+		<Unit filename="src/enums/resources/spritedirection.h" />
+		<Unit filename="src/enums/resources/imageposition.h" />
 		<Unit filename="src/enums/simpletypes/showemptyrows.h" />
 		<Unit filename="src/enums/simpletypes/beingid.h" />
 		<Unit filename="src/enums/simpletypes/equipm.h" />
@@ -1308,19 +1325,22 @@
 		<Unit filename="src/input/pages/basic.h" />
 		<Unit filename="src/input/pages/other.h" />
 		<Unit filename="src/input/pages/shortcuts.h" />
+		<Unit filename="src/input/touch/touchmanager.h" />
+		<Unit filename="src/input/touch/touchactions.h" />
+		<Unit filename="src/input/touch/multitouchmanager.h" />
 		<Unit filename="src/input/inputfunction.h" />
 		<Unit filename="src/input/inputactionoperators.h" />
 		<Unit filename="src/input/inputactionmap.h" />
-		<Unit filename="src/input/multitouchmanager.h" />
 		<Unit filename="src/input/inputmanager.h" />
 		<Unit filename="src/input/keyboardconfig.h" />
-		<Unit filename="src/input/inputcondition.h" />
 		<Unit filename="src/input/mouseinput.h" />
 		<Unit filename="src/input/inputitem.h" />
 		<Unit filename="src/input/joystick.h" />
 		<Unit filename="src/input/keyinput.h" />
-		<Unit filename="src/animationdelayload.h" />
 		<Unit filename="src/avatar.h" />
+		<Unit filename="src/utils/xml/pugixmlwriter.h" />
+		<Unit filename="src/utils/xml/pugixml.h" />
+		<Unit filename="src/utils/xml/libxml.h" />
 		<Unit filename="src/utils/sdlmemoryobject.h" />
 		<Unit filename="src/utils/perfomance.h" />
 		<Unit filename="src/utils/sdl2helper.h" />
@@ -1363,15 +1383,13 @@
 		<Unit filename="src/utils/base64.h" />
 		<Unit filename="src/utils/chatutils.h" />
 		<Unit filename="src/utils/stringvector.h" />
+		<Unit filename="src/utils/xmlwriter.h" />
 		<Unit filename="src/utils/intmap.h" />
 		<Unit filename="src/statuseffect.h" />
 		<Unit filename="src/sdl2gfx/SDL2_rotozoom.h" />
 		<Unit filename="src/sdl2gfx/SDL2_framerate.h" />
 		<Unit filename="src/itemsoundmanager.h" />
-		<Unit filename="src/emoteshortcut.h" />
-		<Unit filename="src/animatedsprite.h" />
 		<Unit filename="src/vector.h" />
-		<Unit filename="src/sprite.h" />
 		<Unit filename="src/beingequipbackend.h" />
 		<Unit filename="src/particle/particle.h" />
 		<Unit filename="src/particle/particlecontainer.h" />
@@ -1387,11 +1405,9 @@
 		<Unit filename="src/particle/particlevector.h" />
 		<Unit filename="src/textcommand.h" />
 		<Unit filename="src/itemcolormanager.h" />
-		<Unit filename="src/touchactions.h" />
 		<Unit filename="src/soundmanager.h" />
 		<Unit filename="src/position.h" />
 		<Unit filename="src/variabledata.h" />
-		<Unit filename="src/flooritem.h" />
 		<Unit filename="src/actormanager.h" />
 		<Unit filename="src/dirs.h" />
 		<Unit filename="src/notifymanager.h" />
@@ -1403,15 +1419,10 @@
 		<Unit filename="src/events/selectionevent.h" />
 		<Unit filename="src/events/actionevent.h" />
 		<Unit filename="src/game.h" />
-		<Unit filename="src/dropshortcut.h" />
-		<Unit filename="src/itemshortcut.h" />
 		<Unit filename="src/mumblemanager.h" />
 		<Unit filename="src/settings.h" />
-		<Unit filename="src/item.h" />
 		<Unit filename="src/commandline.h" />
 		<Unit filename="src/main.h" />
-		<Unit filename="src/shopitem.h" />
-		<Unit filename="src/spellshortcut.h" />
 		<Unit filename="src/actions/windows.h" />
 		<Unit filename="src/actions/actionfuncptr.h" />
 		<Unit filename="src/actions/actiondef.h" />
@@ -1424,45 +1435,43 @@
 		<Unit filename="src/actions/target.h" />
 		<Unit filename="src/actions/actions.h" />
 		<Unit filename="src/graphicsmanager.h" />
+		<Unit filename="src/render/nacl/naclfunctions.h" />
+		<Unit filename="src/render/nacl/naclgles.h" />
 		<Unit filename="src/render/mobileopenglgraphics.h" />
 		<Unit filename="src/render/sdl2softwaregraphics.h" />
 		<Unit filename="src/render/rendererslistsdl2.h" />
-		<Unit filename="src/render/naclfunctions.h" />
-		<Unit filename="src/render/mgl.h" />
 		<Unit filename="src/render/surfacegraphics.h" />
 		<Unit filename="src/render/modernopenglgraphics.h" />
 		<Unit filename="src/render/rendererslistsdl.h" />
-		<Unit filename="src/render/mgldefines.h" />
-		<Unit filename="src/render/mglemu.h" />
 		<Unit filename="src/render/shaders/shadersmanager.h" />
 		<Unit filename="src/render/shaders/shaderprogram.h" />
 		<Unit filename="src/render/shaders/shader.h" />
 		<Unit filename="src/render/nullopenglgraphics.h" />
 		<Unit filename="src/render/imagegraphics.h" />
-		<Unit filename="src/render/mgltypes.h" />
 		<Unit filename="src/render/sdl2graphics.h" />
 		<Unit filename="src/render/renderers.h" />
-		<Unit filename="src/render/naclgles.h" />
 		<Unit filename="src/render/mobileopengl2graphics.h" />
-		<Unit filename="src/render/opengldebug.h" />
-		<Unit filename="src/render/mglx.h" />
-		<Unit filename="src/render/mglxtypes.h" />
+		<Unit filename="src/render/opengl/mgl.h" />
+		<Unit filename="src/render/opengl/mgldefines.h" />
+		<Unit filename="src/render/opengl/mglemu.h" />
+		<Unit filename="src/render/opengl/mgltypes.h" />
+		<Unit filename="src/render/opengl/opengldebug.h" />
+		<Unit filename="src/render/opengl/naclglfunctions.h" />
+		<Unit filename="src/render/opengl/mglcheck.h" />
+		<Unit filename="src/render/opengl/mglfunctions.h" />
 		<Unit filename="src/render/sdlgraphics.h" />
 		<Unit filename="src/render/normalopenglgraphics.h" />
-		<Unit filename="src/render/naclglfunctions.h" />
-		<Unit filename="src/render/mglcheck.h" />
-		<Unit filename="src/render/mglxinit.h" />
+		<Unit filename="src/render/openglx/mglx.h" />
+		<Unit filename="src/render/openglx/mglxtypes.h" />
+		<Unit filename="src/render/openglx/mglxinit.h" />
 		<Unit filename="src/render/safeopenglgraphics.h" />
-		<Unit filename="src/render/mglfunctions.h" />
 		<Unit filename="src/render/graphics.h" />
 		<Unit filename="src/units.h" />
-		<Unit filename="src/shortcutbase.h" />
 		<Unit filename="src/defaults.h" />
 		<Unit filename="src/configmanager.h" />
 		<Unit filename="src/options.h" />
 		<Unit filename="src/winver.h" />
 		<Unit filename="src/equipment.h" />
-		<Unit filename="src/imagesprite.h" />
 		<Unit filename="src/listeners/wrongdatanoticelistener.h" />
 		<Unit filename="src/listeners/updatestatuslistener.h" />
 		<Unit filename="src/listeners/weightlistener.h" />
@@ -1534,6 +1543,9 @@
 		<Unit filename="src/resources/db/horsedb.h" />
 		<Unit filename="src/resources/db/mercenarydb.h" />
 		<Unit filename="src/resources/db/homunculusdb.h" />
+		<Unit filename="src/resources/dye/dye.h" />
+		<Unit filename="src/resources/dye/dyecolor.h" />
+		<Unit filename="src/resources/dye/dyepalette.h" />
 		<Unit filename="src/resources/map/walklayer.h" />
 		<Unit filename="src/resources/map/maplayer.h" />
 		<Unit filename="src/resources/map/tileset.h" />
@@ -1550,6 +1562,9 @@
 		<Unit filename="src/resources/map/speciallayer.h" />
 		<Unit filename="src/resources/map/maprowvertexes.h" />
 		<Unit filename="src/resources/map/tileinfo.h" />
+		<Unit filename="src/resources/item/complexitem.h" />
+		<Unit filename="src/resources/item/item.h" />
+		<Unit filename="src/resources/item/shopitem.h" />
 		<Unit filename="src/resources/horseinfo.h" />
 		<Unit filename="src/resources/notificationinfo.h" />
 		<Unit filename="src/resources/equipmentslots.h" />
@@ -1563,24 +1578,24 @@
 		<Unit filename="src/resources/imageset.h" />
 		<Unit filename="src/resources/beingmenuitem.h" />
 		<Unit filename="src/resources/openglimagehelper.h" />
-		<Unit filename="src/resources/spritereference.h" />
-		<Unit filename="src/resources/dye.h" />
-		<Unit filename="src/resources/atlasmanager.h" />
+		<Unit filename="src/resources/atlas/atlasmanager.h" />
+		<Unit filename="src/resources/atlas/textureatlas.h" />
+		<Unit filename="src/resources/atlas/atlasresource.h" />
+		<Unit filename="src/resources/atlas/atlasitem.h" />
 		<Unit filename="src/resources/wallpaper.h" />
+		<Unit filename="src/resources/inventory/complexinventory.h" />
+		<Unit filename="src/resources/inventory/inventory.h" />
 		<Unit filename="src/resources/sdlmusic.h" />
 		<Unit filename="src/resources/imagewriter.h" />
 		<Unit filename="src/resources/updatefile.h" />
 		<Unit filename="src/resources/effectdescription.h" />
 		<Unit filename="src/resources/screenshothelper.h" />
-		<Unit filename="src/resources/animation.h" />
-		<Unit filename="src/resources/textureatlas.h" />
 		<Unit filename="src/resources/subimage.h" />
 		<Unit filename="src/resources/emotesprite.h" />
 		<Unit filename="src/resources/imagehelper.h" />
 		<Unit filename="src/resources/npcbuttoninfo.h" />
 		<Unit filename="src/resources/imagerect.h" />
 		<Unit filename="src/resources/fboinfo.h" />
-		<Unit filename="src/resources/spritedef.h" />
 		<Unit filename="src/resources/mapreader.h" />
 		<Unit filename="src/resources/itemtypemap.h" />
 		<Unit filename="src/resources/npcdialoginfo.h" />
@@ -1596,7 +1611,6 @@
 		<Unit filename="src/resources/frame.h" />
 		<Unit filename="src/resources/iteminfo.h" />
 		<Unit filename="src/resources/openglscreenshothelper.h" />
-		<Unit filename="src/resources/atlasresource.h" />
 		<Unit filename="src/resources/sdl2softwareimagehelper.h" />
 		<Unit filename="src/resources/sdl2imagehelper.h" />
 		<Unit filename="src/resources/questitemtext.h" />
@@ -1604,33 +1618,35 @@
 		<Unit filename="src/resources/itemslot.h" />
 		<Unit filename="src/resources/chatobject.h" />
 		<Unit filename="src/resources/itemtype.h" />
+		<Unit filename="src/resources/sprite/spritereference.h" />
+		<Unit filename="src/resources/sprite/animationdelayload.h" />
+		<Unit filename="src/resources/sprite/animatedsprite.h" />
+		<Unit filename="src/resources/sprite/sprite.h" />
+		<Unit filename="src/resources/sprite/spritedef.h" />
+		<Unit filename="src/resources/sprite/imagesprite.h" />
+		<Unit filename="src/resources/sprite/spritedisplay.h" />
 		<Unit filename="src/resources/npcimageinfo.h" />
 		<Unit filename="src/resources/skilltype.h" />
-		<Unit filename="src/resources/spriteaction.h" />
-		<Unit filename="src/resources/dyecolor.h" />
 		<Unit filename="src/resources/surfaceimagehelper.h" />
 		<Unit filename="src/resources/itemtypemapdata.h" />
 		<Unit filename="src/resources/notifications.h" />
 		<Unit filename="src/resources/wallpaperdata.h" />
 		<Unit filename="src/resources/skillowner.h" />
 		<Unit filename="src/resources/questitem.h" />
-		<Unit filename="src/resources/spritedisplay.h" />
-		<Unit filename="src/resources/spritedirection.h" />
+		<Unit filename="src/resources/animation/simpleanimation.h" />
+		<Unit filename="src/resources/animation/animation.h" />
 		<Unit filename="src/resources/image.h" />
-		<Unit filename="src/resources/atlasitem.h" />
 		<Unit filename="src/resources/mapinfo.h" />
 		<Unit filename="src/resources/sdl2softwarescreenshothelper.h" />
 		<Unit filename="src/resources/npcinventoryinfo.h" />
 		<Unit filename="src/resources/beingcommon.h" />
 		<Unit filename="src/resources/npctextinfo.h" />
-		<Unit filename="src/resources/dyepalette.h" />
 		<Unit filename="src/resources/resourcemanager.h" />
 		<Unit filename="src/resources/questtype.h" />
 		<Unit filename="src/resources/soundeffect.h" />
 		<Unit filename="src/localconsts.h" />
 		<Unit filename="src/logger.h" />
 		<Unit filename="src/party.h" />
-		<Unit filename="src/inventory.h" />
 		<Unit filename="src/spellmanager.h" />
 		<Unit filename="src/dragdrop.h" />
 		<Unit filename="src/graphicsvertexes.h" />