diff options
-rw-r--r-- | src/emerge.cpp | 25 | ||||
-rw-r--r-- | src/server.h | 25 |
2 files changed, 25 insertions, 25 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp index f5852aaae..0fc31e9e1 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -85,6 +85,31 @@ private: friend class EmergeManager; }; +class MapEditEventAreaIgnorer +{ +public: + MapEditEventAreaIgnorer(VoxelArea *ignorevariable, const VoxelArea &a): + m_ignorevariable(ignorevariable) + { + if(m_ignorevariable->getVolume() == 0) + *m_ignorevariable = a; + else + m_ignorevariable = NULL; + } + + ~MapEditEventAreaIgnorer() + { + if(m_ignorevariable) + { + assert(m_ignorevariable->getVolume() != 0); + *m_ignorevariable = VoxelArea(); + } + } + +private: + VoxelArea *m_ignorevariable; +}; + //// //// EmergeManager //// diff --git a/src/server.h b/src/server.h index fff7f9b6a..ac7ba4f61 100644 --- a/src/server.h +++ b/src/server.h @@ -65,31 +65,6 @@ enum ClientDeletionReason { CDR_DENY }; -class MapEditEventAreaIgnorer -{ -public: - MapEditEventAreaIgnorer(VoxelArea *ignorevariable, const VoxelArea &a): - m_ignorevariable(ignorevariable) - { - if(m_ignorevariable->getVolume() == 0) - *m_ignorevariable = a; - else - m_ignorevariable = NULL; - } - - ~MapEditEventAreaIgnorer() - { - if(m_ignorevariable) - { - assert(m_ignorevariable->getVolume() != 0); - *m_ignorevariable = VoxelArea(); - } - } - -private: - VoxelArea *m_ignorevariable; -}; - struct MediaInfo { std::string path; |