Move UI_PATH back to XMLDocument.hpp

Xottab-DUTY · Xottab-DUTY · commit 690ffbfd149a · 2018-10-17T22:13:06.000+05:00
Sorry....
diff --git a/src/xrCore/XML/XMLDocument.cpp b/src/xrCore/XML/XMLDocument.cpp
@@ -3,6 +3,8 @@
 
 #include "XMLDocument.hpp"
 
+pcstr UI_PATH = "ui";
+
 XMLDocument::XMLDocument() : m_root(), m_pLocalRoot() {}
 
 XMLDocument::~XMLDocument() { ClearInternal(); }
diff --git a/src/xrCore/XML/XMLDocument.hpp b/src/xrCore/XML/XMLDocument.hpp
@@ -15,6 +15,8 @@
 
 // XXX: interesting idea is to have variable configs folder. Need we?
 static constexpr pcstr CONFIG_PATH = _game_config_;
+static constexpr pcstr UI_PATH_DEFAULT = "ui";
+XRCORE_API extern pcstr UI_PATH;
 
 class XML_NODE
 {
diff --git a/src/xrUICore/ui_base.cpp b/src/xrUICore/ui_base.cpp
@@ -2,8 +2,6 @@
 #include "ui_base.h"
 #include "Cursor/UICursor.h"
 
-pcstr UI_PATH = "ui";
-
 CUICursor& GetUICursor() { return GEnv.UI->GetUICursor(); }
 UICore& UI() { return *GEnv.UI; }
 extern ENGINE_API Fvector2 g_current_font_scale;
diff --git a/src/xrUICore/ui_base.h b/src/xrUICore/ui_base.h
@@ -6,9 +6,6 @@
 #include "xrCommon/xr_stack.h"
 #include "xrUICore/FontManager/FontManager.h"
 
-static constexpr pcstr UI_PATH_DEFAULT = "ui";
-XRUICORE_API extern pcstr UI_PATH;
-
 class CUICursor;
 class CUIGameCustom;
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`
`16`	`16`	`// XXX: interesting idea is to have variable configs folder. Need we?`
`17`	`17`	`static constexpr pcstr CONFIG_PATH = _game_config_;`
	`18`	`+static constexpr pcstr UI_PATH_DEFAULT = "ui";`
	`19`	`+XRCORE_API extern pcstr UI_PATH;`
`18`	`20`
`19`	`21`	`class XML_NODE`
`20`	`22`	`{`