summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-11 13:54:40 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-11 13:54:40 +0300
commit51627b2d480b39025be709fb98210c8388add513 (patch)
treec9f75eacefb9afad46a91d9a883c9d861526a68a /src
parentad42810bb9484f4930252ecc34b91d83f37e3293 (diff)
downloadplus-51627b2d480b39025be709fb98210c8388add513.tar.gz
plus-51627b2d480b39025be709fb98210c8388add513.tar.bz2
plus-51627b2d480b39025be709fb98210c8388add513.tar.xz
plus-51627b2d480b39025be709fb98210c8388add513.zip
Extract Location 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/location.h54
-rw-r--r--src/resources/map/map.cpp26
4 files changed, 58 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index da54502f3..477e89e81 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -704,6 +704,7 @@ SET(SRCS
logger.h
main.cpp
main.h
+ resources/map/location.h
resources/map/map.cpp
resources/map/map.h
resources/map/mapheights.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index de93fd832..deb4560f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -793,6 +793,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
logger.h \
main.cpp \
main.h \
+ resources/map/location.h \
resources/map/map.cpp \
resources/map/map.h \
resources/map/mapheights.cpp \
diff --git a/src/resources/map/location.h b/src/resources/map/location.h
new file mode 100644
index 000000000..86726c485
--- /dev/null
+++ b/src/resources/map/location.h
@@ -0,0 +1,54 @@
+/*
+ * 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_LOCATION
+#define RESOURCES_MAP_LOCATION
+
+#include "resources/map/map.h"
+
+#include "localconsts.h"
+
+/**
+ * A location on a tile map. Used for pathfinding, open list.
+ */
+struct Location final
+{
+ /**
+ * Constructor.
+ */
+ Location(const int px, const int py, MetaTile *const ptile):
+ x(px), y(py), tile(ptile)
+ {}
+
+ /**
+ * Comparison operator.
+ */
+ bool operator< (const Location &loc) const
+ {
+ return tile->Fcost > loc.tile->Fcost;
+ }
+
+ int x, y;
+ MetaTile *tile;
+};
+
+#endif // RESOURCES_MAP_LOCATION
diff --git a/src/resources/map/map.cpp b/src/resources/map/map.cpp
index c753b0202..1a95fced8 100644
--- a/src/resources/map/map.cpp
+++ b/src/resources/map/map.cpp
@@ -43,6 +43,8 @@
#include "resources/resourcemanager.h"
#include "resources/subimage.h"
+#include "resources/map/location.h"
+
#include "utils/delete2.h"
#include "utils/dtor.h"
#include "utils/mkdir.h"
@@ -56,30 +58,6 @@
#include "debug.h"
-/**
- * A location on a tile map. Used for pathfinding, open list.
- */
-struct Location final
-{
- /**
- * Constructor.
- */
- Location(const int px, const int py, MetaTile *const ptile):
- x(px), y(py), tile(ptile)
- {}
-
- /**
- * Comparison operator.
- */
- bool operator< (const Location &loc) const
- {
- return tile->Fcost > loc.tile->Fcost;
- }
-
- int x, y;
- MetaTile *tile;
-};
-
class ActorFunctuator final
{
public: