Move spriteaction into separate file.

11 files changed, 76 insertions, 40 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c262e384..e4c60fa76 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -597,6 +597,7 @@ SET(SRCS
     resources/soundeffect.cpp
     resources/soundeffect.h
     resources/soundinfo.h
+    resources/spriteaction.h
     resources/spritedef.h
     resources/spritedef.cpp
     resources/spritedisplay.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 6d1160d25..2d5a1f3e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -705,6 +705,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      resources/soundeffect.cpp \
 	      resources/soundeffect.h \
 	      resources/soundinfo.h \
+	      resources/spriteaction.h \
 	      resources/spritedef.cpp \
 	      resources/spritedef.h \
 	      resources/subimage.cpp \
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index e3ead0bf4..eacdd5e8d 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -30,6 +30,7 @@
 #include "resources/animation.h"
 #include "resources/image.h"
 #include "resources/resourcemanager.h"
+#include "resources/spriteaction.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/animationdelayload.cpp b/src/animationdelayload.cpp
index b5b2989c0..a0bbc2cf9 100644
--- a/src/animationdelayload.cpp
+++ b/src/animationdelayload.cpp
@@ -23,6 +23,7 @@
 #include "animatedsprite.h"
 
 #include "resources/resourcemanager.h"
+#include "resources/spriteaction.h"
 
 #include "debug.h"
 
diff --git a/src/being/being.cpp b/src/being/being.cpp
index 3446351c9..513fe9322 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -64,6 +64,7 @@
 #include "resources/attack.h"
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
+#include "resources/spriteaction.h"
 
 #include "resources/db/avatardb.h"
 #include "resources/db/emotedb.h"
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 6fbf0a5ae..a35cb5805 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -26,6 +26,7 @@
 #include "logger.h"
 
 #include "resources/attack.h"
+#include "resources/spriteaction.h"
 #include "resources/spritereference.h"
 
 #include "resources/map/blockmask.h"
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index acf355b87..a79a678e3 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -22,6 +22,8 @@
 
 #include "resources/iteminfo.h"
 
+#include "resources/spriteaction.h"
+
 #include "resources/map/mapconsts.h"
 
 #include "resources/db/colordb.h"
diff --git a/src/resources/spriteaction.h b/src/resources/spriteaction.h
new file mode 100644
index 000000000..3009f4661
--- /dev/null
+++ b/src/resources/spriteaction.h
@@ -0,0 +1,66 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2014  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
+
+/*
+ * 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 SLEEP("sleep");
+    static const std::string DEAD("dead");
+    static const std::string MOVE("walk");
+    static const std::string ATTACK("attack");
+    static const std::string HURT("hurt");
+    static const std::string USE_SPECIAL("special");
+    static const std::string CAST_MAGIC("magic");
+    static const std::string USE_ITEM("item");
+    static const std::string SPAWN("spawn");
+    static const std::string FLY("fly");
+    static const std::string SWIM("swim");
+    static const std::string STANDSKY("standsky");
+    static const std::string STANDWATER("standwater");
+    static const std::string SITSKY("sitsky");
+    static const std::string SITWATER("sitwater");
+    static const std::string ATTACKSKY("attacksky");
+    static const std::string ATTACKWATER("attackwater");
+    static const std::string SPAWNSKY("spawnsky");
+    static const std::string SPAWNWATER("spawnwater");
+    static const std::string DEADSKY("deadsky");
+    static const std::string DEADWATER("deadwater");
+
+    static const std::string INVALID("");
+}  // namespace SpriteAction
+
+#endif  // RESOURCES_SPRITEACTION_H
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 40194bffb..10617b248 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -31,6 +31,7 @@
 #include "resources/dye.h"
 #include "resources/imageset.h"
 #include "resources/resourcemanager.h"
+#include "resources/spriteaction.h"
 #include "resources/spritereference.h"
 
 #include "configuration.h"
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index a6003be9a..d20865c68 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -36,46 +36,6 @@ class Action;
 class Animation;
 class ImageSet;
 
-/*
- * 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 SLEEP("sleep");
-    static const std::string DEAD("dead");
-    static const std::string MOVE("walk");
-    static const std::string ATTACK("attack");
-    static const std::string HURT("hurt");
-    static const std::string USE_SPECIAL("special");
-    static const std::string CAST_MAGIC("magic");
-    static const std::string USE_ITEM("item");
-    static const std::string SPAWN("spawn");
-    static const std::string FLY("fly");
-    static const std::string SWIM("swim");
-    static const std::string STANDSKY("standsky");
-    static const std::string STANDWATER("standwater");
-    static const std::string SITSKY("sitsky");
-    static const std::string SITWATER("sitwater");
-    static const std::string ATTACKSKY("attacksky");
-    static const std::string ATTACKWATER("attackwater");
-    static const std::string SPAWNSKY("spawnsky");
-    static const std::string SPAWNWATER("spawnwater");
-    static const std::string DEADSKY("deadsky");
-    static const std::string DEADWATER("deadwater");
-
-    static const std::string INVALID("");
-}  // namespace SpriteAction
-
 enum SpriteDirection
 {
     DIRECTION_DEFAULT = 0,
diff --git a/src/statuseffect.cpp b/src/statuseffect.cpp
index 3128e82c8..88c0ac495 100644
--- a/src/statuseffect.cpp
+++ b/src/statuseffect.cpp
@@ -32,6 +32,7 @@
 #include "particle/particle.h"
 
 #include "resources/beingcommon.h"
+#include "resources/spriteaction.h"
 
 #include <map>