summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.editorconfig16
-rw-r--r--src/server/game/Maps/Map.h3
2 files changed, 11 insertions, 8 deletions
diff --git a/.editorconfig b/.editorconfig
index b0597dd794..eb64e2fabc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,8 +1,8 @@
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 4
-tab_width = 4
-insert_final_newline = true
-trim_trailing_whitespace = true
-max_line_length = 80
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+tab_width = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+max_line_length = 80
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index aa8939638e..7e3216e5e3 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -26,6 +26,7 @@
#include "DynamicTree.h"
#include "GameObjectModel.h"
#include "Log.h"
+#include "DataMap.h"
#include <bitset>
#include <list>
@@ -506,6 +507,8 @@ class Map : public GridRefManager<NGridType>
void AllTransportsRemovePassengers(); // pussywizard
TransportsContainer const& GetAllTransports() const { return _transports; }
+ DataMap CustomData;
+
private:
void LoadMapAndVMap(int gx, int gy);
void LoadVMap(int gx, int gy);