Move spriteaction.h into const directory.

4 files changed, 7 insertions, 78 deletions

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/resources/spriteaction.h b/src/resources/spriteaction.h
deleted file mode 100644
index b39c1e96d..000000000
--- a/src/resources/spriteaction.h
+++ /dev/null
@@ -1,74 +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_SPRITEACTION_H
-#define RESOURCES_SPRITEACTION_H
-
-#include <string>
-
-/*
- * Remember those are the main action.
- * Action subtypes, e.g.: "attack_bow" are to be passed by items.xml after
- * an ACTION_ATTACK call.
- * Which special to be use to to be passed with the USE_SPECIAL call.
- * Running, walking, ... is a sub-type of moving.
- * ...
- * Please don't add hard-coded subtypes here!
- */
-namespace SpriteAction
-{
-    static const std::string DEFAULT("stand");
-    static const std::string STAND("stand");
-    static const std::string SIT("sit");
-    static const std::string SITTOP("sittop");
-    static const std::string DEAD("dead");
-    static const std::string MOVE("walk");
-    static const std::string ATTACK("attack");
-    static const std::string SPAWN("spawn");
-    static const std::string CAST("cast");
-
-    static const std::string FLY("fly");
-    static const std::string SWIM("swim");
-    static const std::string RIDE("ride");
-    static const std::string STANDSKY("standsky");
-    static const std::string STANDWATER("standwater");
-    static const std::string STANDRIDE("standride");
-    static const std::string SITSKY("sitsky");
-    static const std::string SITWATER("sitwater");
-    static const std::string SITRIDE("sitride");
-    static const std::string ATTACKSKY("attacksky");
-    static const std::string ATTACKWATER("attackwater");
-    static const std::string ATTACKRIDE("attackride");
-    static const std::string CASTSKY("castsky");
-    static const std::string CASTWATER("castwater");
-    static const std::string CASTRIDE("castride");
-    static const std::string SPAWNSKY("spawnsky");
-    static const std::string SPAWNWATER("spawnwater");
-    static const std::string SPAWNRIDE("spawnride");
-    static const std::string DEADSKY("deadsky");
-    static const std::string DEADWATER("deadwater");
-    static const std::string DEADRIDE("deadride");
-
-    static const std::string INVALID("");
-}  // namespace SpriteAction
-
-#endif  // RESOURCES_SPRITEACTION_H