From f3fdd048e6265ab2c6e88ddff21dffd9409c03db Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 19 May 2014 18:05:14 +0300 Subject: Move mapinfo into separate file. --- src/resources/db/mapdb.cpp | 2 +- src/resources/db/mapdb.h | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) (limited to 'src/resources/db') 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 #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 maps\remap.xml. */ -- cgit v1.2.3-60-g2f50