From 61f191a878e9ef122300dcadfbdf7cd255327862 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 19 May 2014 13:21:49 +0300
Subject: Move spritedisplay into separate file.

---
 src/CMakeLists.txt            |  1 +
 src/Makefile.am               |  1 +
 src/being/actorsprite.h       |  2 ++
 src/resources/beinginfo.h     |  1 +
 src/resources/iteminfo.h      |  1 +
 src/resources/spritedef.h     | 20 ------------------
 src/resources/spritedisplay.h | 48 +++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 54 insertions(+), 20 deletions(-)
 create mode 100644 src/resources/spritedisplay.h

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2612786f0..7c262e384 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -599,6 +599,7 @@ SET(SRCS
     resources/soundinfo.h
     resources/spritedef.h
     resources/spritedef.cpp
+    resources/spritedisplay.h
     resources/spritereference.h
     resources/subimage.cpp
     resources/subimage.h
diff --git a/src/Makefile.am b/src/Makefile.am
index ba7e66255..6d1160d25 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -105,6 +105,7 @@ dyecmd_SOURCES += dyetool/dyemain.cpp \
 	      resources/updatefile.h \
 	      resources/spritedef.cpp \
 	      resources/spritedef.h \
+	      resources/spritedisplay.h \
 	      resources/spritereference.h \
 	      utils/mkdir.cpp \
 	      utils/mkdir.h \
diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h
index bad6ee219..a89d605bd 100644
--- a/src/being/actorsprite.h
+++ b/src/being/actorsprite.h
@@ -24,6 +24,8 @@
 
 #include "localconsts.h"
 
+#include "resources/spritedisplay.h"
+
 #include "resources/map/blocktype.h"
 #include "resources/map/mapconsts.h"
 
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 851295e5a..a5ea837ff 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -29,6 +29,7 @@
 
 #include "resources/soundinfo.h"
 #include "resources/spritedef.h"
+#include "resources/spritedisplay.h"
 
 #include "resources/db/colordb.h"
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index ce318ca61..233ef0dfa 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -29,6 +29,7 @@
 #include "resources/itemtype.h"
 #include "resources/soundinfo.h"
 #include "resources/spritedef.h"
+#include "resources/spritedisplay.h"
 
 #include <map>
 
diff --git a/src/resources/spritedef.h b/src/resources/spritedef.h
index a77ce8411..a6003be9a 100644
--- a/src/resources/spritedef.h
+++ b/src/resources/spritedef.h
@@ -36,26 +36,6 @@ class Action;
 class Animation;
 class ImageSet;
 
-struct SpriteReference;
-
-struct SpriteDisplay final
-{
-    SpriteDisplay() :
-        image(),
-        floor(),
-        sprites(),
-        particles()
-    {
-    }
-
-    std::string image;
-    std::string floor;
-    std::vector<SpriteReference*> sprites;
-    StringVect particles;
-};
-
-typedef std::vector<SpriteReference*>::const_iterator SpriteRefs;
-
 /*
  * Remember those are the main action.
  * Action subtypes, e.g.: "attack_bow" are to be passed by items.xml after
diff --git a/src/resources/spritedisplay.h b/src/resources/spritedisplay.h
new file mode 100644
index 000000000..4e1fef6b5
--- /dev/null
+++ b/src/resources/spritedisplay.h
@@ -0,0 +1,48 @@
+/*
+ *  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_SPRITEDISPLAY_H
+#define RESOURCES_SPRITEDISPLAY_H
+
+#include "utils/stringvector.h"
+
+struct SpriteReference;
+
+struct SpriteDisplay final
+{
+    SpriteDisplay() :
+        image(),
+        floor(),
+        sprites(),
+        particles()
+    {
+    }
+
+    std::string image;
+    std::string floor;
+    std::vector<SpriteReference*> sprites;
+    StringVect particles;
+};
+
+typedef std::vector<SpriteReference*>::const_iterator SpriteRefs;
+
+#endif  // RESOURCES_SPRITEDISPLAY_H
-- 
cgit v1.2.3-70-g09d2