diff options
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/resources/delayedmanager.cpp | 2 | ||||
| -rw-r--r-- | src/resources/sprite/animatedsprite.cpp | 4 | ||||
| -rw-r--r-- | src/resources/sprite/animationdelayload.cpp (renamed from src/animationdelayload.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/sprite/animationdelayload.h (renamed from src/animationdelayload.h) | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 160b98426..cbb406211 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -864,8 +864,8 @@ SET(SRCS actormanager.h resources/sprite/animatedsprite.cpp resources/sprite/animatedsprite.h - animationdelayload.cpp - animationdelayload.h + resources/sprite/animationdelayload.cpp + resources/sprite/animationdelayload.h particle/animationparticle.cpp particle/animationparticle.h avatar.cpp @@ -1298,8 +1298,8 @@ SET(DYE_CMD_SRCS dyetool/dyemain.cpp resources/sprite/animatedsprite.cpp resources/sprite/animatedsprite.h - animationdelayload.cpp - animationdelayload.h + resources/sprite/animationdelayload.cpp + resources/sprite/animationdelayload.h configuration.cpp configuration.h graphicsmanager.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 55010ba10..83d5ec41a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -684,8 +684,8 @@ manaplus_SOURCES += main.cpp \ actormanager.h \ resources/sprite/animatedsprite.cpp \ resources/sprite/animatedsprite.h \ - animationdelayload.cpp \ - animationdelayload.h \ + resources/sprite/animationdelayload.cpp \ + resources/sprite/animationdelayload.h \ actions/actions.cpp \ actions/actions.h \ actions/chat.cpp \ diff --git a/src/resources/delayedmanager.cpp b/src/resources/delayedmanager.cpp index b001db124..cc27dc0d2 100644 --- a/src/resources/delayedmanager.cpp +++ b/src/resources/delayedmanager.cpp @@ -20,7 +20,7 @@ #include "resources/delayedmanager.h" -#include "animationdelayload.h" +#include "resources/sprite/animationdelayload.h" #include "utils/timer.h" diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp index f06a3cc6a..98d4b418d 100644 --- a/src/resources/sprite/animatedsprite.cpp +++ b/src/resources/sprite/animatedsprite.cpp @@ -22,8 +22,6 @@ #include "resources/sprite/animatedsprite.h" -#include "animationdelayload.h" - #include "const/resources/spriteaction.h" #include "render/graphics.h" @@ -35,6 +33,8 @@ #include "resources/animation/animation.h" +#include "resources/sprite/animationdelayload.h" + #include "utils/delete2.h" #include "debug.h" diff --git a/src/animationdelayload.cpp b/src/resources/sprite/animationdelayload.cpp index 85bdaaf3b..8800cb754 100644 --- a/src/animationdelayload.cpp +++ b/src/resources/sprite/animationdelayload.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "animationdelayload.h" +#include "resources/sprite/animationdelayload.h" #include "const/resources/spriteaction.h" diff --git a/src/animationdelayload.h b/src/resources/sprite/animationdelayload.h index a9081d615..9e91a1949 100644 --- a/src/animationdelayload.h +++ b/src/resources/sprite/animationdelayload.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ANIMATIONDELAYLOAD_H -#define ANIMATIONDELAYLOAD_H +#ifndef RESOURCES_SPRITE_ANIMATIONDELAYLOAD_H +#define RESOURCES_SPRITE_ANIMATIONDELAYLOAD_H #include <string> @@ -52,4 +52,4 @@ class AnimationDelayLoad final std::string mAction; }; -#endif // ANIMATIONDELAYLOAD_H +#endif // RESOURCES_SPRITE_ANIMATIONDELAYLOAD_H |