summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-06 19:11:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-06 19:11:52 +0300
commit46816ad7947e3f45e0222a3fafb9c22e087296a6 (patch)
tree290c8fb32c684d1679122acf2341183c2f33c93a
parente27d9f9295df3e5508737493425273e6d2191138 (diff)
downloadmv-46816ad7947e3f45e0222a3fafb9c22e087296a6.tar.gz
mv-46816ad7947e3f45e0222a3fafb9c22e087296a6.tar.bz2
mv-46816ad7947e3f45e0222a3fafb9c22e087296a6.tar.xz
mv-46816ad7947e3f45e0222a3fafb9c22e087296a6.zip
Move actortype.h into enums directory.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/being/actorsprite.h2
-rw-r--r--src/enums/being/actortype.h (renamed from src/being/actortype.h)6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fdc3f45fa..8b2e18f87 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -806,7 +806,7 @@ SET(SRCS
being/actor.h
being/actorsprite.cpp
being/actorsprite.h
- being/actortype.h
+ enums/being/actortype.h
enums/being/attributes.h
listeners/actorspritelistener.h
listeners/arrowslistener.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 21862ee6e..0c9bf28c1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -928,7 +928,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
being/actor.h \
being/actorsprite.cpp \
being/actorsprite.h \
- being/actortype.h \
+ enums/being/actortype.h \
enums/being/attributes.h \
listeners/actorspritelistener.h \
listeners/arrowslistener.cpp \
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index abc0e8690..b9889490c 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -26,9 +26,9 @@
#include "resources/map/mapconsts.h"
#include "being/actor.h"
-#include "being/actortype.h"
#include "being/compoundsprite.h"
+#include "enums/being/actortype.h"
#include "enums/being/targetcursorsize.h"
#include "enums/being/targetcursortype.h"
diff --git a/src/being/actortype.h b/src/enums/being/actortype.h
index 85662174e..c6123a7f4 100644
--- a/src/being/actortype.h
+++ b/src/enums/being/actortype.h
@@ -19,8 +19,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef BEING_ACTORTYPE_H
-#define BEING_ACTORTYPE_H
+#ifndef ENUMS_BEING_ACTORTYPE_H
+#define ENUMS_BEING_ACTORTYPE_H
namespace ActorType
{
@@ -40,4 +40,4 @@ namespace ActorType
};
} // namespace ActorType
-#endif // BEING_ACTORTYPE_H
+#endif // ENUMS_BEING_ACTORTYPE_H