summaryrefslogtreecommitdiff
path: root/src/resources/db
diff options
context:
space:
mode:
Diffstat (limited to 'src/resources/db')
-rw-r--r--src/resources/db/mapdb.cpp2
-rw-r--r--src/resources/db/mapdb.h14
2 files changed, 3 insertions, 13 deletions
diff --git a/src/resources/db/mapdb.cpp b/src/resources/db/mapdb.cpp
index 20d108f13..ea734a150 100644
--- a/src/resources/db/mapdb.cpp
+++ b/src/resources/db/mapdb.cpp
@@ -177,7 +177,7 @@ const std::string MapDB::getMapName(const std::string &name)
return name;
}
-const MapDB::MapInfo *MapDB::getMapAtlas(const std::string &name)
+const MapInfo *MapDB::getMapAtlas(const std::string &name)
{
const MapInfoIter it = mInfos.find(name);
if (it == mInfos.end())
diff --git a/src/resources/db/mapdb.h b/src/resources/db/mapdb.h
index c2fbb3137..ae001ccad 100644
--- a/src/resources/db/mapdb.h
+++ b/src/resources/db/mapdb.h
@@ -24,6 +24,8 @@
#include "utils/stringvector.h"
+#include "resources/mapinfo.h"
+
#include <map>
#include "localconsts.h"
@@ -33,18 +35,6 @@
*/
namespace MapDB
{
- struct MapInfo
- {
- MapInfo() :
- atlas(),
- files(nullptr)
- {
- }
-
- std::string atlas;
- const StringVect *files;
- };
-
/**
* Loads the map remap data from <code>maps\remap.xml</code>.
*/