From 444be435a9ac4da0a8bb5217700cebeaa0c7066c Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 20 Dec 2015 18:12:53 +0300
Subject: Move spritedisplay.h into sprite directory.

---
 src/resources/beinginfo.h            |  3 ++-
 src/resources/iteminfo.h             |  3 ++-
 src/resources/sprite/spritedisplay.h | 46 ++++++++++++++++++++++++++++++++++++
 src/resources/spritedisplay.h        | 46 ------------------------------------
 4 files changed, 50 insertions(+), 48 deletions(-)
 create mode 100644 src/resources/sprite/spritedisplay.h
 delete mode 100644 src/resources/spritedisplay.h

(limited to 'src/resources')

diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index 6a84723a3..139c5e5c7 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -33,7 +33,8 @@
 #include "resources/beingmenuitem.h"
 #include "resources/cursor.h"
 #include "resources/soundinfo.h"
-#include "resources/spritedisplay.h"
+
+#include "resources/sprite/spritedisplay.h"
 
 struct Attack;
 
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index 6ab059d7c..12b1019c1 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -31,7 +31,8 @@
 #include "resources/cursor.h"
 #include "resources/itemtype.h"
 #include "resources/soundinfo.h"
-#include "resources/spritedisplay.h"
+
+#include "resources/sprite/spritedisplay.h"
 
 #include "utils/intmap.h"
 
diff --git a/src/resources/sprite/spritedisplay.h b/src/resources/sprite/spritedisplay.h
new file mode 100644
index 000000000..a3abcd928
--- /dev/null
+++ b/src/resources/sprite/spritedisplay.h
@@ -0,0 +1,46 @@
+/*
+ *  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_SPRITE_SPRITEDISPLAY_H
+#define RESOURCES_SPRITE_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;
+};
+
+#endif  // RESOURCES_SPRITE_SPRITEDISPLAY_H
diff --git a/src/resources/spritedisplay.h b/src/resources/spritedisplay.h
deleted file mode 100644
index edeee10c8..000000000
--- a/src/resources/spritedisplay.h
+++ /dev/null
@@ -1,46 +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_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;
-};
-
-#endif  // RESOURCES_SPRITEDISPLAY_H
-- 
cgit v1.2.3-60-g2f50