Merge remote-tracking branch 'origin/noggit-shadowlands' into noggit-shadowlands

2021-12-13 01:07:28 +03:00
parent ec8caddc33 6fc671c92a
commit 3bf5ae2a66
44 changed files with 447 additions and 483 deletions
--- a/src/noggit/map_index.cpp
+++ b/src/noggit/map_index.cpp
@@ -1,8 +1,6 @@
 // This file is part of Noggit3, licensed under GNU General Public License (version 3).

 #include <noggit/AsyncLoader.h>
-
-#include <noggit/MapChunk.h>
 #include <noggit/MapChunk.h>
 #include <noggit/MapTile.h>
 #include <noggit/Misc.h>
@@ -23,8 +21,6 @@
 #include <QRegExp>
 #include <QFile>

-#include <boost/range/adaptor/map.hpp>
-
 #include <forward_list>
 #include <cstdlib>