summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-11 14:49:16 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-11 14:49:16 +0300
commitbc38561388687e964872231b8a9b488c48e988b8 (patch)
tree5f478d74a1bf52fb21088aea994a67cf55c2ca36 /src
parente80e2536085d2a2f0d971007eb00c662ccfc5fda (diff)
downloadmv-bc38561388687e964872231b8a9b488c48e988b8.tar.gz
mv-bc38561388687e964872231b8a9b488c48e988b8.tar.bz2
mv-bc38561388687e964872231b8a9b488c48e988b8.tar.xz
mv-bc38561388687e964872231b8a9b488c48e988b8.zip
Move mapoject into separate file.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/resources/map/maplayer.h14
-rw-r--r--src/resources/map/mapobject.h40
4 files changed, 44 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b235e41d..bc95e36e2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -711,6 +711,7 @@ SET(SRCS
resources/map/mapheights.h
resources/map/maplayer.cpp
resources/map/maplayer.h
+ resources/map/mapobject.h
resources/map/maprowvertexes.h
resources/map/metatile.h
render/mgl.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4e7375258..77673a7f4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -800,6 +800,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
resources/map/mapheights.h \
resources/map/maplayer.cpp \
resources/map/maplayer.h \
+ resources/map/mapobject.h \
resources/map/maprowvertexes.h \
resources/map/metatile.h \
render/mgl.cpp \
diff --git a/src/resources/map/maplayer.h b/src/resources/map/maplayer.h
index f6eff689c..7da75a6f8 100644
--- a/src/resources/map/maplayer.h
+++ b/src/resources/map/maplayer.h
@@ -28,6 +28,8 @@
#include "listeners/configlistener.h"
+#include "resources/map/mapobject.h"
+
#include "being/actor.h"
#include <string>
@@ -39,18 +41,6 @@ class MapItem;
class MapRowVertexes;
class SpecialLayer;
-class MapObject final
-{
- public:
- MapObject(const int type0, const std::string &data0) :
- type(type0), data(data0)
- {
- }
-
- int type;
- std::string data;
-};
-
class MapObjectList final
{
public:
diff --git a/src/resources/map/mapobject.h b/src/resources/map/mapobject.h
new file mode 100644
index 000000000..72046c5ad
--- /dev/null
+++ b/src/resources/map/mapobject.h
@@ -0,0 +1,40 @@
+/*
+ * 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_MAP_MAPOBJECT_H
+#define RESOURCES_MAP_MAPOBJECT_H
+
+#include <string>
+
+class MapObject final
+{
+ public:
+ MapObject(const int type0, const std::string &data0) :
+ type(type0), data(data0)
+ {
+ }
+
+ int type;
+ std::string data;
+};
+
+#endif // RESOURCES_MAP_MAPOBJECT_H