diff --git a/MissionEditor/IniMega.h b/MissionEditor/IniMega.h new file mode 100644 index 0000000..b29ccd4 --- /dev/null +++ b/MissionEditor/IniMega.h @@ -0,0 +1,33 @@ +#pragma once + +#include +#include "INIMeta.h" +#include "variables.h" + +extern CIniFile rules; + +class IniMegaFile +{ + friend class IniFileGroup; +public: + static IniFileGroup GetRules(); + + static bool IsNullOrEmpty(const CString& value) { return isNullOrEmpty(value); } + +private: + static bool isNullOrEmpty(const CString& value); +}; + + +IniFileGroup IniMegaFile::GetRules() +{ + IniFileGroup m_group; + m_group.Append(rules); + m_group.Append(Map->GetIniFile()); + return m_group; +} + +bool IniMegaFile::isNullOrEmpty(const CString& value) +{ + return !value.GetLength() || value == "none" || value == ""; +} \ No newline at end of file diff --git a/MissionEditor/ViewObjects.cpp b/MissionEditor/ViewObjects.cpp index 35318e4..b617afe 100644 --- a/MissionEditor/ViewObjects.cpp +++ b/MissionEditor/ViewObjects.cpp @@ -33,7 +33,7 @@ #include "rtpdlg.h" #include "TubeTool.h" #include "StringHelper.h" -#include "INIMeta.h" +#include "IniMega.h" #ifdef _DEBUG #define new DEBUG_NEW @@ -514,19 +514,6 @@ __inline HTREEITEM TV_InsertItemW(HWND hWnd, WCHAR* lpString, int len, HTREEITEM return res; } -IniFileGroup IniMegaFile::GetRules() -{ - IniFileGroup m_group; - m_group.Append(rules); - m_group.Append(Map->GetIniFile()); - return m_group; -} - -bool IniMegaFile::isNullOrEmpty(const CString& value) -{ - return !value.GetLength() || value == "none" || value == ""; -} - const IgnoreSet CollectIgnoreSet() { IgnoreSet ret; diff --git a/MissionEditor/ViewObjects.h b/MissionEditor/ViewObjects.h index 833f2e1..80c5d75 100644 --- a/MissionEditor/ViewObjects.h +++ b/MissionEditor/ViewObjects.h @@ -32,15 +32,11 @@ #define MAKE_MASK(refVal) 1 << static_cast(refVal) class TreeViewBuilder; -class CViewObjects; -class IniFileGroup; using IgnoreSet = std::unordered_set; static const IgnoreSet CollectIgnoreSet(); -extern CIniFile rules; - class TreeRoot { friend class TreeViewBuilder; friend class CViewObjects; @@ -225,20 +221,6 @@ private: void HandleBrushSize(int iTile); }; -class IniMegaFile -{ - friend class IniFileGroup; -public: - static IniFileGroup GetRules(); - - static bool IsNullOrEmpty(const CString& value) { return isNullOrEmpty(value); } - -private: - static bool isNullOrEmpty(const CString& value); - - -}; - ///////////////////////////////////////////////////////////////////////////// //{{AFX_INSERT_LOCATION}}