X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fevent.h;h=149f7eecd906dd40f06f3f1c0064e6f81e4c99db;hb=8f73ec6c6c18ea5676261064399a650911333da5;hp=c53c59d74ef46a1e4e1d2fc537836bddfcc934f1;hpb=921151d97a2fb2238ab514324fb95e2732248b96;p=oweals%2Fminetest.git

diff --git a/src/event.h b/src/event.h
index c53c59d74..149f7eecd 100644
--- a/src/event.h
+++ b/src/event.h
@@ -19,37 +19,42 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #pragma once
 
+#include "irrlichttypes.h"
+
 class MtEvent
 {
 public:
-	virtual ~MtEvent() {};
-	//virtual MtEvent* clone(){ return new IEvent; }
-	virtual const char* getType() const = 0;
-
-	MtEvent* checkIs(const std::string &type)
+	enum Type : u8
 	{
-		if(type == getType())
-			return this;
-		return NULL;
-	}
+		VIEW_BOBBING_STEP = 0,
+		CAMERA_PUNCH_LEFT,
+		CAMERA_PUNCH_RIGHT,
+		PLAYER_FALLING_DAMAGE,
+		PLAYER_DAMAGE,
+		NODE_DUG,
+		PLAYER_JUMP,
+		PLAYER_REGAIN_GROUND,
+		TYPE_MAX,
+	};
+
+	virtual ~MtEvent() = default;
+	virtual Type getType() const = 0;
 };
 
 // An event with no parameters and customizable name
-class SimpleTriggerEvent: public MtEvent
+class SimpleTriggerEvent : public MtEvent
 {
-	const char *type;
+	Type type;
+
 public:
-	SimpleTriggerEvent(const char *type):
-		type(type)
-	{}
-	const char* getType() const
-	{return type;}
+	SimpleTriggerEvent(Type type) : type(type) {}
+	Type getType() const override { return type; }
 };
 
 class MtEventReceiver
 {
 public:
-	virtual ~MtEventReceiver(){};
+	virtual ~MtEventReceiver() = default;
 	virtual void onEvent(MtEvent *e) = 0;
 };
 
@@ -58,11 +63,9 @@ typedef void (*event_receive_func)(MtEvent *e, void *data);
 class MtEventManager
 {
 public:
-	virtual ~MtEventManager(){};
+	virtual ~MtEventManager() = default;
 	virtual void put(MtEvent *e) = 0;
-	virtual void reg(const char *type, event_receive_func f, void *data) = 0;
+	virtual void reg(MtEvent::Type type, event_receive_func f, void *data) = 0;
 	// If data==NULL, every occurence of f is deregistered.
-	virtual void dereg(const char *type, event_receive_func f, void *data) = 0;
-	virtual void reg(MtEventReceiver *r, const char *type) = 0;
-	virtual void dereg(MtEventReceiver *r, const char *type) = 0;
+	virtual void dereg(MtEvent::Type type, event_receive_func f, void *data) = 0;
 };