X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fobjdef.h;h=9ab3df9775e41a6e3a7022a99898ca2629942771;hb=5e61f64ce259fe0b23cbb377b44e90a0fbc820d7;hp=e7e956e511d17130e125e0f91a253db53b1072bf;hpb=c56d7fe0eba7905b0a63c4a1cfe909988653c23d;p=oweals%2Fminetest.git

diff --git a/src/objdef.h b/src/objdef.h
index e7e956e51..9ab3df977 100644
--- a/src/objdef.h
+++ b/src/objdef.h
@@ -17,13 +17,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef OBJDEF_HEADER
-#define OBJDEF_HEADER
+#pragma once
 
+#include "util/basic_macros.h"
 #include "porting.h"
 
 class IGameDef;
-class INodeDefManager;
+class NodeDefManager;
 
 #define OBJDEF_INVALID_INDEX ((u32)(-1))
 #define OBJDEF_INVALID_HANDLE 0
@@ -43,7 +43,7 @@ enum ObjDefType {
 
 class ObjDef {
 public:
-	virtual ~ObjDef() {}
+	virtual ~ObjDef() = default;
 
 	u32 index;
 	u32 uid;
@@ -58,6 +58,7 @@ class ObjDefManager {
 public:
 	ObjDefManager(IGameDef *gamedef, ObjDefType type);
 	virtual ~ObjDefManager();
+	DISABLE_CLASS_COPY(ObjDefManager);
 
 	virtual const char *getObjectTitle() const { return "ObjDef"; }
 
@@ -79,7 +80,7 @@ public:
 
 	size_t getNumObjects() const { return m_objects.size(); }
 	ObjDefType getType() const { return m_objtype; }
-	INodeDefManager *getNodeDef() const { return m_ndef; }
+	const NodeDefManager *getNodeDef() const { return m_ndef; }
 
 	u32 validateHandle(ObjDefHandle handle) const;
 	static ObjDefHandle createHandle(u32 index, ObjDefType type, u32 uid);
@@ -87,12 +88,7 @@ public:
 		ObjDefType *type, u32 *uid);
 
 protected:
-	INodeDefManager *m_ndef;
+	const NodeDefManager *m_ndef;
 	std::vector<ObjDef *> m_objects;
 	ObjDefType m_objtype;
-
-private:
-	DISABLE_CLASS_COPY(ObjDefManager);
 };
-
-#endif