diff options
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/being/actor.h | 4 | ||||
| -rw-r--r-- | src/resources/vector.cpp (renamed from src/vector.cpp) | 2 | ||||
| -rw-r--r-- | src/resources/vector.h (renamed from src/vector.h) | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cc2d33a30..5c0a49bcf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1427,8 +1427,8 @@ SET(SRCS input/touch/touchmanager.cpp input/touch/touchmanager.h variabledata.h - vector.cpp - vector.h + resources/vector.cpp + resources/vector.h resources/map/walklayer.cpp resources/map/walklayer.h events/actionevent.h diff --git a/src/Makefile.am b/src/Makefile.am index c4acb8f8e..9ba65e2f2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -905,8 +905,8 @@ BASE_SRC += client.h \ input/touch/touchmanager.cpp \ input/touch/touchmanager.h \ variabledata.h \ - vector.cpp \ - vector.h \ + resources/vector.cpp \ + resources/vector.h \ net/ipc.cpp \ net/ipc.h \ net/sdltcpnet.cpp \ diff --git a/src/being/actor.h b/src/being/actor.h index 19bcd1e1c..302d02bda 100644 --- a/src/being/actor.h +++ b/src/being/actor.h @@ -22,10 +22,10 @@ #ifndef BEING_ACTOR_H #define BEING_ACTOR_H -#include "vector.h" - #include "utils/cast.h" +#include "resources/vector.h" + #include <list> #include "localconsts.h" diff --git a/src/vector.cpp b/src/resources/vector.cpp index be94198fd..258e0a72b 100644 --- a/src/vector.cpp +++ b/src/resources/vector.cpp @@ -20,7 +20,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "vector.h" +#include "resources/vector.h" #include "debug.h" diff --git a/src/vector.h b/src/resources/vector.h index d17502f17..0b564d897 100644 --- a/src/vector.h +++ b/src/resources/vector.h @@ -20,8 +20,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef VECTOR_H -#define VECTOR_H +#ifndef RESOURCES_VECTOR_H +#define RESOURCES_VECTOR_H #ifndef USE_SDL2 #include <cmath> @@ -213,4 +213,4 @@ class Vector final */ std::ostream& operator <<(std::ostream &os, const Vector &v); -#endif // VECTOR_H +#endif // RESOURCES_VECTOR_H |