summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-12 15:42:09 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-12 15:42:09 +0300
commitdb6b712e4169d80f8f2c84a0efbc553d2058c191 (patch)
treed2686ac79474c32d81da85be6f83385c74386a72
parent11a49b50fb6c2ff20f62f39d8606f54770b6a295 (diff)
downloadplus-db6b712e4169d80f8f2c84a0efbc553d2058c191.tar.gz
plus-db6b712e4169d80f8f2c84a0efbc553d2058c191.tar.bz2
plus-db6b712e4169d80f8f2c84a0efbc553d2058c191.tar.xz
plus-db6b712e4169d80f8f2c84a0efbc553d2058c191.zip
Extract compountitem into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/being/compounditem.h46
-rw-r--r--src/being/compoundsprite.h18
4 files changed, 50 insertions, 16 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 280078a01..46ce71ab1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -636,6 +636,7 @@ SET(SRCS
commandhandler.h
commands.cpp
commands.h
+ being/compounditem.h
being/compoundsprite.cpp
being/compoundsprite.h
being/gender.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 3ce90be29..c5ff53410 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -725,6 +725,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
commandhandler.h \
commands.cpp \
commands.h \
+ being/compounditem.h \
being/compoundsprite.cpp \
being/compoundsprite.h \
being/gender.h \
diff --git a/src/being/compounditem.h b/src/being/compounditem.h
new file mode 100644
index 000000000..73909c56a
--- /dev/null
+++ b/src/being/compounditem.h
@@ -0,0 +1,46 @@
+/*
+ * The ManaPlus Client
+ * 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 BEING_COMPOUNDITEM_H
+#define BEING_COMPOUNDITEM_H
+
+#include <list>
+
+#include "localconsts.h"
+
+class Image;
+
+typedef std::list <const void*> VectorPointers;
+
+class CompoundItem final
+{
+ public:
+ CompoundItem();
+
+ A_DELETE_COPY(CompoundItem)
+
+ ~CompoundItem();
+
+ VectorPointers data;
+ Image *image;
+ Image *alphaImage;
+};
+
+#endif // BEING_COMPOUNDITEM_H
diff --git a/src/being/compoundsprite.h b/src/being/compoundsprite.h
index 20f5a376a..7e983ad2d 100644
--- a/src/being/compoundsprite.h
+++ b/src/being/compoundsprite.h
@@ -24,6 +24,8 @@
#include "sprite.h"
+#include "being/compounditem.h"
+
#include <list>
#include <vector>
@@ -31,22 +33,6 @@
class Image;
-typedef std::list <const void*> VectorPointers;
-
-class CompoundItem final
-{
- public:
- CompoundItem();
-
- A_DELETE_COPY(CompoundItem)
-
- ~CompoundItem();
-
- VectorPointers data;
- Image *image;
- Image *alphaImage;
-};
-
class CompoundSprite : public Sprite
{
public: