summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/animatedsprite.cpp3
-rw-r--r--src/animationdelayload.cpp3
-rw-r--r--src/being/being.cpp3
-rw-r--r--src/const/resources/spriteaction.h (renamed from src/resources/spriteaction.h)6
-rw-r--r--src/gui/windows/skilldialog.cpp3
-rw-r--r--src/resources/beinginfo.cpp3
-rw-r--r--src/resources/iteminfo.cpp5
-rw-r--r--src/resources/sprite/spritedef.cpp3
-rw-r--r--src/statuseffect.cpp3
11 files changed, 22 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fbff965d1..800ae25a8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -734,7 +734,7 @@ SET(SRCS
resources/soundeffect.cpp
resources/soundeffect.h
resources/soundinfo.h
- resources/spriteaction.h
+ const/resources/spriteaction.h
resources/sprite/spritedef.h
resources/sprite/spritedef.cpp
resources/spritedirection.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 7b446fb73..3e036fe7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -383,7 +383,7 @@ SRC += events/actionevent.h \
resources/soundeffect.cpp \
resources/soundeffect.h \
resources/soundinfo.h \
- resources/spriteaction.h \
+ const/resources/spriteaction.h \
resources/sprite/spritedef.cpp \
resources/sprite/spritedef.h \
resources/spritedirection.h \
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index cf5b275db..93e448cc3 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -24,6 +24,8 @@
#include "animationdelayload.h"
+#include "const/resources/spriteaction.h"
+
#include "render/graphics.h"
#include "resources/action.h"
@@ -31,7 +33,6 @@
#include "resources/delayedmanager.h"
#include "resources/image.h"
#include "resources/resourcemanager.h"
-#include "resources/spriteaction.h"
#include "utils/delete2.h"
diff --git a/src/animationdelayload.cpp b/src/animationdelayload.cpp
index c52355963..437496c51 100644
--- a/src/animationdelayload.cpp
+++ b/src/animationdelayload.cpp
@@ -22,8 +22,9 @@
#include "animatedsprite.h"
+#include "const/resources/spriteaction.h"
+
#include "resources/resourcemanager.h"
-#include "resources/spriteaction.h"
#include "debug.h"
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 565ae2446..a5e9acf9b 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -41,6 +41,8 @@
#include "const/utils/timer.h"
+#include "const/resources/spriteaction.h"
+
#include "enums/being/beingdirection.h"
#include "particle/particleinfo.h"
@@ -70,7 +72,6 @@
#include "resources/emotesprite.h"
#include "resources/horseinfo.h"
#include "resources/iteminfo.h"
-#include "resources/spriteaction.h"
#include "resources/db/avatardb.h"
#include "resources/db/badgesdb.h"
diff --git a/src/resources/spriteaction.h b/src/const/resources/spriteaction.h
index b39c1e96d..a7071b3e1 100644
--- a/src/resources/spriteaction.h
+++ b/src/const/resources/spriteaction.h
@@ -20,8 +20,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RESOURCES_SPRITEACTION_H
-#define RESOURCES_SPRITEACTION_H
+#ifndef CONST_RESOURCES_SPRITEACTION_H
+#define CONST_RESOURCES_SPRITEACTION_H
#include <string>
@@ -71,4 +71,4 @@ namespace SpriteAction
static const std::string INVALID("");
} // namespace SpriteAction
-#endif // RESOURCES_SPRITEACTION_H
+#endif // CONST_RESOURCES_SPRITEACTION_H
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index e163923cc..0446bc886 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -30,6 +30,8 @@
#include "being/localplayer.h"
#include "being/playerinfo.h"
+#include "const/resources/spriteaction.h"
+
#include "gui/windows/setupwindow.h"
#include "gui/windows/shortcutwindow.h"
@@ -53,7 +55,6 @@
#include "utils/timer.h"
#include "resources/beingcommon.h"
-#include "resources/spriteaction.h"
#include "debug.h"
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index b857335ba..7bb5685ad 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -25,10 +25,11 @@
#include "configuration.h"
#include "logger.h"
+#include "const/resources/spriteaction.h"
+
#include "enums/resources/map/blockmask.h"
#include "resources/attack.h"
-#include "resources/spriteaction.h"
#include "resources/spritereference.h"
#include "resources/db/colordb.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 490a185bc..03f0ad422 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -22,11 +22,12 @@
#include "resources/iteminfo.h"
-#include "resources/spriteaction.h"
-#include "resources/spritedirection.h"
+#include "const/resources/spriteaction.h"
#include "const/resources/map/map.h"
+#include "resources/spritedirection.h"
+
#include "resources/db/colordb.h"
#include "resources/db/itemdb.h"
diff --git a/src/resources/sprite/spritedef.cpp b/src/resources/sprite/spritedef.cpp
index cb0fc777c..453da9f28 100644
--- a/src/resources/sprite/spritedef.cpp
+++ b/src/resources/sprite/spritedef.cpp
@@ -26,6 +26,8 @@
#include "logger.h"
#include "settings.h"
+#include "const/resources/spriteaction.h"
+
#include "const/resources/map/map.h"
#include "resources/action.h"
@@ -33,7 +35,6 @@
#include "resources/dye.h"
#include "resources/imageset.h"
#include "resources/resourcemanager.h"
-#include "resources/spriteaction.h"
#include "resources/spritereference.h"
#include "debug.h"
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index c3aed4ea0..4c8719b21 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -26,6 +26,8 @@
#include "configuration.h"
#include "soundmanager.h"
+#include "const/resources/spriteaction.h"
+
#include "gui/widgets/tabs/chat/chattab.h"
#include "particle/particle.h"
@@ -33,7 +35,6 @@
#include "listeners/debugmessagelistener.h"
#include "resources/beingcommon.h"
-#include "resources/spriteaction.h"
#include "debug.h"