summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-20 18:07:37 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-20 18:07:37 +0300
commitd7db223d0663df45756b184307a77eb11aba8cec (patch)
tree952a6c237076a76c978036607b2ea4042d8b27af /src/resources
parent0d6c76d9827442d4f89482b64077cba8a7ddc47d (diff)
downloadmv-d7db223d0663df45756b184307a77eb11aba8cec.tar.gz
mv-d7db223d0663df45756b184307a77eb11aba8cec.tar.bz2
mv-d7db223d0663df45756b184307a77eb11aba8cec.tar.xz
mv-d7db223d0663df45756b184307a77eb11aba8cec.zip
Move spritedirection into enums directory.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/action.h2
-rw-r--r--src/resources/db/itemdb.cpp3
-rw-r--r--src/resources/iteminfo.cpp2
-rw-r--r--src/resources/sprite/spritedef.h2
-rw-r--r--src/resources/spritedirection.h43
5 files changed, 5 insertions, 47 deletions
diff --git a/src/resources/action.h b/src/resources/action.h
index d9426d8c1..c73c96c93 100644
--- a/src/resources/action.h
+++ b/src/resources/action.h
@@ -23,7 +23,7 @@
#ifndef RESOURCES_ACTION_H
#define RESOURCES_ACTION_H
-#include "resources/spritedirection.h"
+#include "enums/resources/spritedirection.h"
#include <map>
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index 42c2f645b..5429698f1 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -27,10 +27,11 @@
#include "configuration.h"
#include "logger.h"
+#include "enums/resources/spritedirection.h"
+
#include "resources/beingcommon.h"
#include "resources/iteminfo.h"
#include "resources/itemtypemapdata.h"
-#include "resources/spritedirection.h"
#include "resources/spritereference.h"
#include "resources/db/itemdbstat.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 03f0ad422..2d48ccd66 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -26,7 +26,7 @@
#include "const/resources/map/map.h"
-#include "resources/spritedirection.h"
+#include "enums/resources/spritedirection.h"
#include "resources/db/colordb.h"
#include "resources/db/itemdb.h"
diff --git a/src/resources/sprite/spritedef.h b/src/resources/sprite/spritedef.h
index 02ce98ff9..cab987668 100644
--- a/src/resources/sprite/spritedef.h
+++ b/src/resources/sprite/spritedef.h
@@ -25,7 +25,7 @@
#include "resources/resource.h"
-#include "resources/spritedirection.h"
+#include "enums/resources/spritedirection.h"
#include "utils/xml.h"
diff --git a/src/resources/spritedirection.h b/src/resources/spritedirection.h
deleted file mode 100644
index 92c7ac09e..000000000
--- a/src/resources/spritedirection.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * The ManaPlus Client
- * Copyright (C) 2004-2009 The Mana World Development Team
- * Copyright (C) 2009-2010 The Mana Developers
- * Copyright (C) 2011-2015 The ManaPlus Developers
- *
- * This file is part of The ManaPlus Client.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef RESOURCES_SPRITEDIRECTION_H
-#define RESOURCES_SPRITEDIRECTION_H
-
-namespace SpriteDirection
-{
- enum Type
- {
- DEFAULT = 0,
- UP = 1,
- DOWN = 2,
- LEFT = 3,
- RIGHT = 4,
- UPLEFT = 5,
- UPRIGHT = 6,
- DOWNLEFT = 7,
- DOWNRIGHT = 8,
- INVALID
- };
-} // namespace SpriteDirection
-
-#endif // RESOURCES_SPRITEDIRECTION_H