summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/Makefile.am6
-rw-r--r--src/animationdelayload.cpp4
-rw-r--r--src/being/actorsprite.cpp2
-rw-r--r--src/being/being.cpp3
-rw-r--r--src/being/localplayer.cpp3
-rw-r--r--src/game.cpp3
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp3
-rw-r--r--src/gui/windowmanager_unittest.cc4
-rw-r--r--src/gui/windows/ministatuswindow.cpp3
-rw-r--r--src/resources/db/emotedb.cpp3
-rw-r--r--src/resources/sprite/animatedsprite.cpp (renamed from src/animatedsprite.cpp)2
-rw-r--r--src/resources/sprite/animatedsprite.h (renamed from src/animatedsprite.h)6
-rw-r--r--src/resources/sprite/animatedsprite_unittest.cc (renamed from src/animatedsprite_unittest.cc)5
-rw-r--r--src/statuseffect.cpp3
15 files changed, 33 insertions, 25 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cb4eb0fd4..1307039e4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -862,8 +862,8 @@ SET(SRCS
listeners/charrenamelistener.h
actormanager.cpp
actormanager.h
- animatedsprite.cpp
- animatedsprite.h
+ resources/sprite/animatedsprite.cpp
+ resources/sprite/animatedsprite.h
animationdelayload.cpp
animationdelayload.h
particle/animationparticle.cpp
@@ -1296,8 +1296,8 @@ SET(DYE_CMD_SRCS
events/event.h
gui/rect.h
dyetool/dyemain.cpp
- animatedsprite.cpp
- animatedsprite.h
+ resources/sprite/animatedsprite.cpp
+ resources/sprite/animatedsprite.h
animationdelayload.cpp
animationdelayload.h
configuration.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b3c0aac5..98ad1ef6d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -682,8 +682,8 @@ manaplus_SOURCES += main.cpp \
avatar.h \
actormanager.cpp \
actormanager.h \
- animatedsprite.cpp \
- animatedsprite.h \
+ resources/sprite/animatedsprite.cpp \
+ resources/sprite/animatedsprite.h \
animationdelayload.cpp \
animationdelayload.h \
actions/actions.cpp \
@@ -1680,7 +1680,7 @@ check_PROGRAMS = manaplustests
manaplustests_CXXFLAGS = ${manaplus_CXXFLAGS} \
-DUNITTESTS
manaplustests_SOURCES = ${manaplus_SOURCES} \
- animatedsprite_unittest.cc \
+ resources/sprite/animatedsprite_unittest.cc \
enums/enums_unittest.cc \
gui/windowmanager_unittest.cc \
gui/fonts/textchunklist_unittest.cc \
diff --git a/src/animationdelayload.cpp b/src/animationdelayload.cpp
index 437496c51..85bdaaf3b 100644
--- a/src/animationdelayload.cpp
+++ b/src/animationdelayload.cpp
@@ -20,12 +20,12 @@
#include "animationdelayload.h"
-#include "animatedsprite.h"
-
#include "const/resources/spriteaction.h"
#include "resources/resourcemanager.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "debug.h"
AnimationDelayLoad::AnimationDelayLoad(const std::string &fileName,
diff --git a/src/being/actorsprite.cpp b/src/being/actorsprite.cpp
index a19cae0a2..c9577b2dc 100644
--- a/src/being/actorsprite.cpp
+++ b/src/being/actorsprite.cpp
@@ -21,7 +21,6 @@
#include "being/actorsprite.h"
-#include "animatedsprite.h"
#include "configuration.h"
#include "imagesprite.h"
#include "statuseffect.h"
@@ -38,6 +37,7 @@
#include "resources/resourcemanager.h"
+#include "resources/sprite/animatedsprite.h"
#include "resources/sprite/spritereference.h"
#include "utils/checkutils.h"
diff --git a/src/being/being.cpp b/src/being/being.cpp
index a5e9acf9b..9881707f4 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -23,7 +23,6 @@
#include "being/being.h"
#include "actormanager.h"
-#include "animatedsprite.h"
#include "beingequipbackend.h"
#include "configuration.h"
#include "effectmanager.h"
@@ -87,6 +86,8 @@
#include "resources/map/map.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "gui/widgets/createwidget.h"
#include "gui/widgets/skilldata.h"
#include "gui/widgets/skillinfo.h"
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 37e5abdc8..1526afd9d 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -23,7 +23,6 @@
#include "being/localplayer.h"
#include "actormanager.h"
-#include "animatedsprite.h"
#include "configuration.h"
#include "gamemodifiers.h"
#include "guild.h"
@@ -82,6 +81,8 @@
#include "listeners/awaylistener.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "utils/delete2.h"
#include "utils/gettext.h"
#include "utils/timer.h"
diff --git a/src/game.cpp b/src/game.cpp
index 29dcca1df..a6aa8e8cb 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -23,7 +23,6 @@
#include "game.h"
#include "actormanager.h"
-#include "animatedsprite.h"
#include "client.h"
#include "configuration.h"
#include "dropshortcut.h"
@@ -115,6 +114,8 @@
#include "resources/map/map.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "utils/delete2.h"
#include "utils/gettext.h"
#include "utils/mkdir.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 7cba5872e..e83e91bb8 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -21,7 +21,6 @@
#include "gui/widgets/emoteshortcutcontainer.h"
-#include "animatedsprite.h"
#include "emoteshortcut.h"
#include "settings.h"
@@ -40,6 +39,8 @@
#include "resources/db/emotedb.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "utils/stringutils.h"
#include "debug.h"
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 9b686568c..9f0c30d34 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -18,8 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "animatedsprite.h"
-
#include "catch.hpp"
#include "client.h"
#include "settings.h"
@@ -51,6 +49,8 @@
#include "resources/resourcemanager.h"
#include "resources/sdlimagehelper.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "utils/delete2.h"
#include "utils/env.h"
#include "utils/gettext.h"
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index aa544e128..a58693262 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -22,7 +22,6 @@
#include "gui/windows/ministatuswindow.h"
-#include "animatedsprite.h"
#include "configuration.h"
#include "inventory.h"
@@ -43,6 +42,8 @@
#include "net/playerhandler.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "utils/delete2.h"
#include "utils/dtor.h"
#include "utils/gettext.h"
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index eb5eef418..688df188b 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -21,7 +21,6 @@
#include "resources/db/emotedb.h"
-#include "animatedsprite.h"
#include "client.h"
#include "logger.h"
@@ -31,6 +30,8 @@
#include "resources/emoteinfo.h"
#include "resources/emotesprite.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "debug.h"
namespace
diff --git a/src/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index 93e448cc3..58ee1864b 100644
--- a/src/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "animatedsprite.h"
+#include "resources/sprite/animatedsprite.h"
#include "animationdelayload.h"
diff --git a/src/animatedsprite.h b/src/resources/sprite/animatedsprite.h
index be27e5d10..db21e661d 100644
--- a/src/animatedsprite.h
+++ b/src/resources/sprite/animatedsprite.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ANIMATEDSPRITE_H
-#define ANIMATEDSPRITE_H
+#ifndef RESOURCES_SPRITE_ANIMATEDSPRITE_H
+#define RESOURCES_SPRITE_ANIMATEDSPRITE_H
#include "resources/sprite/sprite.h"
@@ -145,4 +145,4 @@ class AnimatedSprite final : public Sprite
static bool mEnableCache;
};
-#endif // ANIMATEDSPRITE_H
+#endif // RESOURCES_SPRITE_ANIMATEDSPRITE_H
diff --git a/src/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc
index a2e8bfd9f..06e57935c 100644
--- a/src/animatedsprite_unittest.cc
+++ b/src/resources/sprite/animatedsprite_unittest.cc
@@ -18,17 +18,18 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "animatedsprite.h"
+#include "resources/sprite/animatedsprite.h"
#include "catch.hpp"
#include "client.h"
+#include "const/resources/spriteaction.h"
+
#include "gui/theme.h"
#include "resources/animation.h"
#include "resources/resourcemanager.h"
#include "resources/sdlimagehelper.h"
-#include "resources/spriteaction.h"
#include "utils/env.h"
#include "utils/physfstools.h"
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 4c8719b21..a6e241e0c 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -22,7 +22,6 @@
#include "statuseffect.h"
-#include "animatedsprite.h"
#include "configuration.h"
#include "soundmanager.h"
@@ -36,6 +35,8 @@
#include "resources/beingcommon.h"
+#include "resources/sprite/animatedsprite.h"
+
#include "debug.h"
static void unloadMap(std::map<int, StatusEffect *> &map);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 10:33:51 +0000