Lua doors api

zone/doors.cpp

@@ -766,7 +766,7 @@ void Doors::SetOpenType(uint8 in) {
 	entity_list.RespawnAllDoors();
 }
 
-void Doors::SetDoorName(char* name) {
+void Doors::SetDoorName(const char* name) {
 	entity_list.DespawnAllDoors();
 	memset(door_name, 0, sizeof(door_name));
 	strncpy(door_name, name, sizeof(door_name));

zone/doors.h

@@ -68,7 +68,7 @@ public:
 	void	SetZ(float in);
 	void	SetHeading(float in);
 	void	SetIncline(int in);
-	void	SetDoorName(char* name);
+	void	SetDoorName(const char* name);
 	void	SetOpenType(uint8 in);
 	void	SetLocation(float x, float y, float z);
 	void	SetSize(uint16 size);

zone/lua_client.h

@@ -24,12 +24,7 @@ public:
 	virtual ~Lua_Client() { }
 
 	operator Client*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<Client*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<Client*>(d);
-		}
-
-		return nullptr;
 	}
 
 	void SendSound();

zone/lua_corpse.cpp

@@ -155,6 +155,8 @@ void Lua_Corpse::AddLooter(Lua_Mob who) {
 luabind::scope lua_register_corpse() {
 	return luabind::class_<Lua_Corpse, Lua_Mob>("Corpse")
 		.def(luabind::constructor<>())
+		.property("null", &Lua_Corpse::Null)
+		.property("valid", &Lua_Corpse::Valid)
 		.def("GetCharID", (uint32(Lua_Corpse::*)(void))&Lua_Corpse::GetCharID)
 		.def("GetDecayTime", (uint32(Lua_Corpse::*)(void))&Lua_Corpse::GetDecayTime)
 		.def("Lock", (void(Lua_Corpse::*)(void))&Lua_Corpse::Lock)
@@ -183,9 +185,7 @@ luabind::scope lua_register_corpse() {
 		.def("GetSilver", (uint32(Lua_Corpse::*)(void))&Lua_Corpse::GetSilver)
 		.def("GetGold", (uint32(Lua_Corpse::*)(void))&Lua_Corpse::GetGold)
 		.def("GetPlatinum", (uint32(Lua_Corpse::*)(void))&Lua_Corpse::GetPlatinum)
-		.def("AddLooter", (void(Lua_Corpse::*)(Lua_Mob))&Lua_Corpse::AddLooter)
+		.def("AddLooter", (void(Lua_Corpse::*)(Lua_Mob))&Lua_Corpse::AddLooter);
-		.property("null", &Lua_Corpse::Null)
-		.property("valid", &Lua_Corpse::Valid);
 }
 
 #endif

zone/lua_corpse.h

@@ -22,12 +22,7 @@ public:
 	virtual ~Lua_Corpse() { }
 
 	operator Corpse*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<Corpse*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<Corpse*>(d);
-		}
-
-		return nullptr;
 	}
 
 	uint32 GetCharID();

zone/lua_door.cpp

@@ -7,11 +7,173 @@
 #include "doors.h"
 #include "lua_door.h"
 
+int Lua_Door::GetID() {
+	Lua_Safe_Call_Int();
+	return self->GetID();
+}
+
+void Lua_Door::SetDoorName(const char *name) {
+	Lua_Safe_Call_Void();
+	self->SetDoorName(name);
+}
+
+const char *Lua_Door::GetDoorName() {
+	Lua_Safe_Call_String();
+	return self->GetDoorName();
+}
+
+float Lua_Door::GetX() {
+	Lua_Safe_Call_Real();
+	return self->GetX();
+}
+
+float Lua_Door::GetY() {
+	Lua_Safe_Call_Real();
+	return self->GetY();
+}
+
+float Lua_Door::GetZ() {
+	Lua_Safe_Call_Real();
+	return self->GetZ();
+}
+
+float Lua_Door::GetHeading() {
+	Lua_Safe_Call_Real();
+	return self->GetHeading();
+}
+
+void Lua_Door::SetX(float x) {
+	Lua_Safe_Call_Void();
+	self->SetX(x);
+}
+
+void Lua_Door::SetY(float y) {
+	Lua_Safe_Call_Void();
+	self->SetY(y);
+}
+
+void Lua_Door::SetZ(float z) {
+	Lua_Safe_Call_Void();
+	self->SetZ(z);
+}
+
+void Lua_Door::SetHeading(float h) {
+	Lua_Safe_Call_Void();
+	self->SetHeading(h);
+}
+
+void Lua_Door::SetLocation(float x, float y, float z) {
+	Lua_Safe_Call_Void();
+	self->SetLocation(x, y, z);
+}
+
+uint32 Lua_Door::GetDoorDBID() {
+	Lua_Safe_Call_Int();
+	return self->GetDoorDBID();
+}
+
+uint32 Lua_Door::GetDoorID() {
+	Lua_Safe_Call_Int();
+	return self->GetDoorID();
+}
+
+void Lua_Door::SetSize(uint32 sz) {
+	Lua_Safe_Call_Void();
+	self->SetSize(sz);
+}
+
+uint32 Lua_Door::GetSize() {
+	Lua_Safe_Call_Int();
+	return self->GetSize();
+}
+
+void Lua_Door::SetIncline(uint32 incline) {
+	Lua_Safe_Call_Void();
+	self->SetIncline(incline);
+}
+
+uint32 Lua_Door::GetIncline() {
+	Lua_Safe_Call_Int();
+	return self->GetIncline();
+}
+
+void Lua_Door::SetOpenType(uint32 type) {
+	Lua_Safe_Call_Void();
+	self->SetOpenType(type);
+}
+
+uint32 Lua_Door::GetOpenType() {
+	Lua_Safe_Call_Int();
+	return self->GetOpenType();
+}
+
+void Lua_Door::SetLockPick(uint32 pick) {
+	Lua_Safe_Call_Void();
+	self->SetLockpick(pick);
+}
+
+uint32 Lua_Door::GetLockPick() {
+	Lua_Safe_Call_Int();
+	return self->GetLockpick();
+}
+
+void Lua_Door::SetKeyItem(uint32 key) {
+	Lua_Safe_Call_Void();
+	self->SetKeyItem(key);
+}
+
+uint32 Lua_Door::GetKeyItem() {
+	Lua_Safe_Call_Int();
+	return self->GetKeyItem();
+}
+
+void Lua_Door::SetNoKeyring(int type) {
+	Lua_Safe_Call_Void();
+	self->SetNoKeyring(type);
+}
+
+int Lua_Door::GetNoKeyring() {
+	Lua_Safe_Call_Int();
+	return self->GetNoKeyring();
+}
+
+void Lua_Door::CreateDatabaseEntry() {
+	Lua_Safe_Call_Void();
+	self->CreateDatabaseEntry();
+}
+
 luabind::scope lua_register_door() {
 	return luabind::class_<Lua_Door, Lua_Entity>("Door")
 		.def(luabind::constructor<>())
 		.property("null", &Lua_Door::Null)
-		.property("valid", &Lua_Door::Valid);
+		.property("valid", &Lua_Door::Valid)
+		.def("GetID", (int(Lua_Door::*)(void))&Lua_Door::GetID)
+		.def("SetDoorName", (void(Lua_Door::*)(const char*))&Lua_Door::SetDoorName)
+		.def("GetDoorName", (const char*(Lua_Door::*)(void))&Lua_Door::GetDoorName)
+		.def("GetX", (float(Lua_Door::*)(void))&Lua_Door::GetX)
+		.def("GetY", (float(Lua_Door::*)(void))&Lua_Door::GetY)
+		.def("GetZ", (float(Lua_Door::*)(void))&Lua_Door::GetZ)
+		.def("GetHeading", (float(Lua_Door::*)(void))&Lua_Door::GetHeading)
+		.def("SetX", (void(Lua_Door::*)(float))&Lua_Door::SetX)
+		.def("SetY", (void(Lua_Door::*)(float))&Lua_Door::SetY)
+		.def("SetZ", (void(Lua_Door::*)(float))&Lua_Door::SetZ)
+		.def("SetHeading", (void(Lua_Door::*)(float))&Lua_Door::SetHeading)
+		.def("SetLocation", (void(Lua_Door::*)(float,float,float))&Lua_Door::SetLocation)
+		.def("GetDoorDBID", (uint32(Lua_Door::*)(void))&Lua_Door::GetDoorDBID)
+		.def("GetDoorID", (uint32(Lua_Door::*)(void))&Lua_Door::GetDoorID)
+		.def("SetSize", (void(Lua_Door::*)(uint32))&Lua_Door::SetSize)
+		.def("GetSize", (uint32(Lua_Door::*)(void))&Lua_Door::GetSize)
+		.def("SetIncline", (void(Lua_Door::*)(uint32))&Lua_Door::SetIncline)
+		.def("GetIncline", (uint32(Lua_Door::*)(void))&Lua_Door::GetIncline)
+		.def("SetOpenType", (void(Lua_Door::*)(uint32))&Lua_Door::SetOpenType)
+		.def("GetOpenType", (uint32(Lua_Door::*)(void))&Lua_Door::GetOpenType)
+		.def("SetLockPick", (void(Lua_Door::*)(uint32))&Lua_Door::SetLockPick)
+		.def("GetLockPick", (uint32(Lua_Door::*)(void))&Lua_Door::GetLockPick)
+		.def("SetKeyItem", (void(Lua_Door::*)(uint32))&Lua_Door::SetKeyItem)
+		.def("GetKeyItem", (uint32(Lua_Door::*)(void))&Lua_Door::GetKeyItem)
+		.def("SetNoKeyring", (void(Lua_Door::*)(int))&Lua_Door::SetNoKeyring)
+		.def("GetNoKeyring", (int(Lua_Door::*)(void))&Lua_Door::GetNoKeyring)
+		.def("CreateDatabaseEntry", (void(Lua_Door::*)(void))&Lua_Door::CreateDatabaseEntry);
 }
 
 #endif

zone/lua_door.h

@@ -28,6 +28,34 @@ public:
 
 		return nullptr;
 	}
+
+	int GetID();
+	void SetDoorName(const char *name);
+	const char *GetDoorName();
+	float GetX();
+	float GetY();
+	float GetZ();
+	float GetHeading();
+	void SetX(float x);
+	void SetY(float y);
+	void SetZ(float z);
+	void SetHeading(float h);
+	void SetLocation(float x, float y, float z);
+	uint32 GetDoorDBID();
+	uint32 GetDoorID();
+	void SetSize(uint32 sz);
+	uint32 GetSize();
+	void SetIncline(uint32 incline);
+	uint32 GetIncline();
+	void SetOpenType(uint32 type);
+	uint32 GetOpenType();
+	void SetLockPick(uint32 pick);
+	uint32 GetLockPick();
+	void SetKeyItem(uint32 key);
+	uint32 GetKeyItem();
+	void SetNoKeyring(int type);
+	int GetNoKeyring();
+	void CreateDatabaseEntry();
 };
 
 #endif

zone/lua_entity.h

@@ -30,12 +30,7 @@ public:
 	virtual ~Lua_Entity() { }
 
 	operator Entity*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<Entity*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<Entity*>(d);
-		}
-
-		return nullptr;
 	}
 
 	bool IsClient();

zone/lua_entity_list.h

@@ -41,12 +41,7 @@ public:
 	virtual ~Lua_EntityList() { }
 
 	operator EntityList*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<EntityList*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<EntityList*>(d);
-		}
-
-		return nullptr;
 	}
 
 	Lua_Mob GetMobID(int id);

zone/lua_group.h

@@ -23,12 +23,7 @@ public:
 	virtual ~Lua_Group() { }
 
 	operator Group*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<Group*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<Group*>(d);
-		}
-
-		return nullptr;
 	}
 
 	void DisbandGroup();

zone/lua_item.h

@@ -22,12 +22,7 @@ public:
 	virtual ~Lua_Item() { }
 
 	operator const Item_Struct*() {
-		const void *d = GetLuaPtrData();
+		return reinterpret_cast<const Item_Struct*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<const Item_Struct*>(d);
-		}
-
-		return nullptr;
 	}
 
 	int GetMinStatus();

zone/lua_iteminst.h

@@ -22,12 +22,7 @@ public:
 	virtual ~Lua_ItemInst() { }
 
 	operator ItemInst*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<ItemInst*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<ItemInst*>(d);
-		}
-
-		return nullptr;
 	}
 
 	bool IsType(int item_class);

zone/lua_mob.h

@@ -25,12 +25,7 @@ public:
 	virtual ~Lua_Mob() { }
 
 	operator Mob*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<Mob*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<Mob*>(d);
-		}
-
-		return nullptr;
 	}
 
 	const char *GetName();

zone/lua_npc.h

@@ -24,12 +24,7 @@ public:
 	virtual ~Lua_NPC() { }
 
 	operator NPC*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<NPC*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<NPC*>(d);
-		}
-
-		return nullptr;
 	}
 
 	void Signal(int id);

zone/lua_raid.h

@@ -23,12 +23,7 @@ public:
 	virtual ~Lua_Raid() { }
 
 	operator Raid*() {
-		void *d = GetLuaPtrData();
+		return reinterpret_cast<Raid*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<Raid*>(d);
-		}
-
-		return nullptr;
 	}
 
 	bool IsRaidMember(const char *name);

zone/lua_spell.h

@@ -21,12 +21,7 @@ public:
 	virtual ~Lua_Spell() { }
 
 	operator const SPDat_Spell_Struct*() {
-		const void *d = GetLuaPtrData();
+		return reinterpret_cast<const SPDat_Spell_Struct*>(GetLuaPtrData());
-		if(d) {
-			return reinterpret_cast<const SPDat_Spell_Struct*>(d);
-		}
-
-		return nullptr;
 	}
 
 	int GetID();