Move frame into separate file.

4 files changed, 60 insertions, 22 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 81c457984..6c1336b1e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -532,6 +532,7 @@ SET(SRCS
     resources/db/emotedb.cpp
     resources/db/emotedb.h
     resources/fboinfo.h
+    resources/frame.h
     resources/image.cpp
     resources/image.h
     resources/imagehelper.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a845cb34e..a85f4e8f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -637,6 +637,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      resources/db/emotedb.cpp \
 	      resources/db/emotedb.h \
 	      resources/fboinfo.h \
+	      resources/frame.h \
 	      resources/image.cpp \
 	      resources/image.h \
 	      resources/imagehelper.cpp \
diff --git a/src/resources/animation.h b/src/resources/animation.h
index 7eaacac2a..964bcc23f 100644
--- a/src/resources/animation.h
+++ b/src/resources/animation.h
@@ -23,6 +23,8 @@
 #ifndef RESOURCES_ANIMATION_H
 #define RESOURCES_ANIMATION_H
 
+#include "resources/frame.h"
+
 #include <vector>
 #include <string>
 
@@ -30,28 +32,7 @@
 
 class Image;
 
-/**
- * A single frame in an animation, with a delay and an offset.
- */
-struct Frame final
-{
-    enum FrameType
-    {
-        ANIMATION = 0,
-        JUMP,
-        GOTO,
-        LABEL,
-        PAUSE
-    };
-
-    Image *image;
-    int delay;
-    int offsetX;
-    int offsetY;
-    int rand;
-    FrameType type;
-    std::string nextAction;
-};
+struct Frame;
 
 /**
  * An animation consists of several frames, each with their own delay and
diff --git a/src/resources/frame.h b/src/resources/frame.h
new file mode 100644
index 000000000..3d85a04ac
--- /dev/null
+++ b/src/resources/frame.h
@@ -0,0 +1,55 @@
+/*
+ *  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_FRAME_H
+#define RESOURCES_FRAME_H
+
+#include <string>
+
+#include "localconsts.h"
+
+class Image;
+
+/**
+ * A single frame in an animation, with a delay and an offset.
+ */
+struct Frame final
+{
+    enum FrameType
+    {
+        ANIMATION = 0,
+        JUMP,
+        GOTO,
+        LABEL,
+        PAUSE
+    };
+
+    Image *image;
+    int delay;
+    int offsetX;
+    int offsetY;
+    int rand;
+    FrameType type;
+    std::string nextAction;
+};
+
+#endif  // RESOURCES_FRAME_H