Added id to spells so i can export them to lua correctly. Also made the lua_classes less messy by having them all derive from Lua_Ptr instead of reimplementing functionality

common/shareddb.cpp

@@ -1636,6 +1636,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
 			}
 
 			++counter;
+			sp[tempid].id = tempid;
 			strn0cpy(sp[tempid].name, row[1], sizeof(sp[tempid].name));
 			strn0cpy(sp[tempid].player_1, row[2], sizeof(sp[tempid].player_1));
 			strn0cpy(sp[tempid].teleport_zone, row[3], sizeof(sp[tempid].teleport_zone));

common/spdat.h

@@ -603,7 +603,7 @@ typedef enum {
 //
 struct SPDat_Spell_Struct
 {
-/* 000 */	//int id;	// not used
+/* 000 */	int	id;	// not used
 /* 001 */	char		name[64]; // Name of the spell
 /* 002 */	char		player_1[32]; // "PLAYER_1"
 /* 003 */	char		teleport_zone[64];	// Teleport zone, pet name summoned, or item summoned

zone/CMakeLists.txt

@@ -38,6 +38,7 @@ SET(zone_sources
 	lua_npc.cpp
 	lua_parser.cpp
 	lua_parser_events.cpp
+	lua_spell.cpp
 	embperl.cpp
 	embxs.cpp
 	entity.cpp
@@ -136,6 +137,8 @@ SET(zone_headers
 	lua_npc.h
 	lua_parser.h
 	lua_parser_events.h
+	lua_ptr.h
+	lua_spell.h
 	map.h
 	masterentity.h
 	maxskill.h

zone/lua_client.h

@@ -10,13 +10,14 @@ class Lua_Client : public Lua_Mob
 {
 	typedef Client NativeType;
 public:
-	Lua_Client() { d_ = nullptr; }
+	Lua_Client() { }
-	Lua_Client(NativeType *d) { d_ = d; }
+	Lua_Client(Client *d) { SetLuaPtrData(d); }
 	virtual ~Lua_Client() { }
 
-	operator NativeType* () {
+	operator Client*() {
-		if(d_) {
+		void *d = GetLuaPtrData();
-			return reinterpret_cast<NativeType*>(d_);
+		if(d) {
+			return reinterpret_cast<Client*>(d);
 		}
 
 		return nullptr;

zone/lua_entity.cpp

@@ -6,14 +6,6 @@
 #include "lua_client.h"
 #include "lua_npc.h"
 
-bool Lua_Entity::Null() {
-	return d_ == nullptr;
-}
-
-bool Lua_Entity::Valid() {
-	return d_ != nullptr;
-}
-
 bool Lua_Entity::IsClient() {
 	Lua_Safe_Call_Bool();
 	return self->IsClient();
@@ -75,17 +67,20 @@ int Lua_Entity::GetID() {
 }
 
 Lua_Client Lua_Entity::CastToClient() {
-	Client *m = reinterpret_cast<Client*>(d_);
+	void *d = GetLuaPtrData();
+	Client *m = reinterpret_cast<Client*>(d);
 	return Lua_Client(m);
 }
 
 Lua_NPC Lua_Entity::CastToNPC() {
-	NPC *m = reinterpret_cast<NPC*>(d_);
+	void *d = GetLuaPtrData();
+	NPC *m = reinterpret_cast<NPC*>(d);
 	return Lua_NPC(m);
 }
 
 Lua_Mob Lua_Entity::CastToMob() {
-	Mob *m = reinterpret_cast<Mob*>(d_);
+	void *d = GetLuaPtrData();
+	Mob *m = reinterpret_cast<Mob*>(d);
 	return Lua_Mob(m);
 }
 

zone/lua_entity.h

@@ -2,6 +2,8 @@
 #define EQEMU_LUA_ENTITY_H
 #ifdef LUA_EQEMU
 
+#include "lua_ptr.h"
+
 class Entity;
 class Lua_Client;
 class Lua_NPC;
@@ -24,24 +26,23 @@ class Lua_Mob;
 #define Lua_Safe_Call_NPC() if(!d_) { return Lua_NPC(); } NativeType *self = reinterpret_cast<NativeType*>(d_)
 #define Lua_Safe_Call_Client() if(!d_) { return Lua_Client(); } NativeType *self = reinterpret_cast<Type*>(d_)
 
-class Lua_Entity
+class Lua_Entity : public Lua_Ptr
 {
 	typedef Entity NativeType;
 public:
-	Lua_Entity() { d_ = nullptr; }
+	Lua_Entity() { }
-	Lua_Entity(NativeType *d) : d_(d) { }
+	Lua_Entity(Entity *d) : Lua_Ptr(d) { }
 	virtual ~Lua_Entity() { }
 
-	operator NativeType* () {
+	operator Entity*() {
-		if(d_) {
+		void *d = GetLuaPtrData();
-			return reinterpret_cast<NativeType*>(d_);
+		if(d) {
+			return reinterpret_cast<Entity*>(d);
 		}
 
 		return nullptr;
 	}
 
-	bool Null();
-	bool Valid();
 	bool IsClient();
 	bool IsNPC();
 	bool IsMob();
@@ -64,8 +65,6 @@ public:
 	//Lua_Doors CastToDoors();
 	//Lua_Trap CastToTrap();
 	//Lua_Beacon CastToBeacon();
-
-	void *d_;
 };
 
 #endif

zone/lua_item.cpp

@@ -3,12 +3,4 @@
 #include "masterentity.h"
 #include "lua_item.h"
 
-bool Lua_Item::Null() {
-	return d_ == nullptr;
-}
-
-bool Lua_Item::Valid() {
-	return d_ != nullptr;
-}
-
 #endif

zone/lua_item.h

@@ -2,27 +2,26 @@
 #define EQEMU_LUA_ITEM_H
 #ifdef LUA_EQEMU
 
+#include "lua_ptr.h"
+
 class ItemInst;
 
-class Lua_Item
+class Lua_Item : public Lua_Ptr
 {
+	typedef ItemInst NativeType;
 public:
-	Lua_Item() { d_ = nullptr; }
+	Lua_Item() { }
-	Lua_Item(ItemInst *d) { d_ = d; }
+	Lua_Item(ItemInst *d) : Lua_Ptr(d) { }
 	virtual ~Lua_Item() { }
 
-	operator ItemInst* () {
+	operator ItemInst*() {
-		if(d_) {
+		void *d = GetLuaPtrData();
-			return reinterpret_cast<ItemInst*>(d_);
+		if(d) {
+			return reinterpret_cast<ItemInst*>(d);
 		}
 
 		return nullptr;
 	}
-
-	bool Null();
-	bool Valid();
-
-	void *d_;
 };
 
 #endif

zone/lua_mob.h

@@ -10,13 +10,14 @@ class Lua_Mob : public Lua_Entity
 {
 	typedef Mob NativeType;
 public:
-	Lua_Mob() { d_ = nullptr; }
+	Lua_Mob() { }
-	Lua_Mob(NativeType *d) { d_ = d; }
+	Lua_Mob(Mob *d) { SetLuaPtrData(d); }
 	virtual ~Lua_Mob() { }
 
-	operator NativeType* () {
+	operator Mob*() {
-		if(d_) {
+		void *d = GetLuaPtrData();
-			return reinterpret_cast<NativeType*>(d_);
+		if(d) {
+			return reinterpret_cast<Mob*>(d);
 		}
 
 		return nullptr;

zone/lua_npc.h

@@ -10,13 +10,14 @@ class Lua_NPC : public Lua_Mob
 {
 	typedef NPC NativeType;
 public:
-	Lua_NPC() { d_ = nullptr; }
+	Lua_NPC() { }
-	Lua_NPC(NativeType *d) { d_ = d; }
+	Lua_NPC(NPC *d) { SetLuaPtrData(d); }
 	virtual ~Lua_NPC() { }
 
-	operator NativeType* () {
+	operator NPC*() {
-		if(d_) {
+		void *d = GetLuaPtrData();
-			return reinterpret_cast<NativeType*>(d_);
+		if(d) {
+			return reinterpret_cast<NPC*>(d);
 		}
 
 		return nullptr;

zone/lua_parser.cpp

@@ -5,6 +5,7 @@
 #include <boost/any.hpp>
 
 #include "masterentity.h"
+#include "../common/spdat.h"
 #include "../common/seperator.h"
 #include "lua_entity.h"
 #include "lua_mob.h"

zone/lua_ptr.h

@@ -0,0 +1,38 @@
+#ifndef EQEMU_LUA_PTR_H
+#define EQEMU_LUA_PTR_H
+#ifdef LUA_EQEMU
+
+class Lua_Ptr
+{
+public:
+	Lua_Ptr() {
+	}
+	
+	Lua_Ptr(void *d) : d_(d) {
+	}
+	
+	~Lua_Ptr() {
+	}
+	
+	void *GetLuaPtrData() {
+		return d_;
+	}
+	
+	void SetLuaPtrData(void *d) {
+		d_ = d;
+	}
+	
+	bool Null() {
+		return d_ == nullptr;
+	}
+	
+	bool Valid() {
+		return d_ != nullptr;
+	}
+	
+protected:
+	void *d_;
+};
+
+#endif
+#endif

zone/lua_spell.cpp

@@ -0,0 +1,6 @@
+#ifdef LUA_EQEMU
+
+#include "../common/spdat.h"
+#include "lua_spell.h"
+
+#endif

zone/lua_spell.h

@@ -0,0 +1,28 @@
+#ifndef EQEMU_LUA_ITEM_H
+#define EQEMU_LUA_ITEM_H
+#ifdef LUA_EQEMU
+
+#include "lua_ptr.h"
+
+struct SPDat_Spell_Struct;
+
+class Lua_Spell : public Lua_Ptr
+{
+	typedef SPDat_Spell_Struct NativeType;
+public:
+	Lua_Spell() { }
+	Lua_Spell(SPDat_Spell_Struct *d) : Lua_Ptr(d) { }
+	virtual ~Lua_Spell() { }
+
+	operator SPDat_Spell_Struct*() {
+		void *d = GetLuaPtrData();
+		if(d) {
+			return reinterpret_cast<SPDat_Spell_Struct*>(d);
+		}
+
+		return nullptr;
+	}
+};
+
+#endif
+#endif