Skip to content

Commit 31b84ce

Browse files
committed
Move MapEditEventAreaIgnorer to emerge.cpp
It's only used in emerge threads and it's a local object, don't expose it to the whole Minetest
1 parent 4a4eba7 commit 31b84ce

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

src/emerge.cpp

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,31 @@ class EmergeThread : public Thread {
8585
friend class EmergeManager;
8686
};
8787

88+
class MapEditEventAreaIgnorer
89+
{
90+
public:
91+
MapEditEventAreaIgnorer(VoxelArea *ignorevariable, const VoxelArea &a):
92+
m_ignorevariable(ignorevariable)
93+
{
94+
if(m_ignorevariable->getVolume() == 0)
95+
*m_ignorevariable = a;
96+
else
97+
m_ignorevariable = NULL;
98+
}
99+
100+
~MapEditEventAreaIgnorer()
101+
{
102+
if(m_ignorevariable)
103+
{
104+
assert(m_ignorevariable->getVolume() != 0);
105+
*m_ignorevariable = VoxelArea();
106+
}
107+
}
108+
109+
private:
110+
VoxelArea *m_ignorevariable;
111+
};
112+
88113
////
89114
//// EmergeManager
90115
////

src/server.h

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -65,31 +65,6 @@ enum ClientDeletionReason {
6565
CDR_DENY
6666
};
6767

68-
class MapEditEventAreaIgnorer
69-
{
70-
public:
71-
MapEditEventAreaIgnorer(VoxelArea *ignorevariable, const VoxelArea &a):
72-
m_ignorevariable(ignorevariable)
73-
{
74-
if(m_ignorevariable->getVolume() == 0)
75-
*m_ignorevariable = a;
76-
else
77-
m_ignorevariable = NULL;
78-
}
79-
80-
~MapEditEventAreaIgnorer()
81-
{
82-
if(m_ignorevariable)
83-
{
84-
assert(m_ignorevariable->getVolume() != 0);
85-
*m_ignorevariable = VoxelArea();
86-
}
87-
}
88-
89-
private:
90-
VoxelArea *m_ignorevariable;
91-
};
92-
9368
struct MediaInfo
9469
{
9570
std::string path;

0 commit comments

Comments
 (0)