pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-18 12:28:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Bug Fix] Resolve subroutine redefinition due to bot methods. (#2117)

Browse Source 
* [Bug Fix] Resolve subroutine definition due to bot methods.

* Update perl_bot.cpp
This commit is contained in:
Kinglykrab
2022-05-06 20:33:20 -04:00
committed by GitHub
parent 37d5d96871
commit 1e45ffa24d
5 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/lua_bot.cpp
+36 -36
View File
@@ -8,54 +8,54 @@
#include "lua_bot.h"
#include "lua_mob.h"
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id);
self->AddBotItem(slot_id, item_id);
}
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id, int16 charges) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id, int16 charges) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id, charges);
self->AddBotItem(slot_id, item_id, charges);
}
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id, charges, attuned);
self->AddBotItem(slot_id, item_id, charges, attuned);
}
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id, charges, attuned, augment_one);
self->AddBotItem(slot_id, item_id, charges, attuned, augment_one);
}
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id, charges, attuned, augment_one, augment_two);
self->AddBotItem(slot_id, item_id, charges, attuned, augment_one, augment_two);
}
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two, uint32 augment_three) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two, uint32 augment_three) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id, charges, attuned, augment_one, augment_two, augment_three);
self->AddBotItem(slot_id, item_id, charges, attuned, augment_one, augment_two, augment_three);
}
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two, uint32 augment_three, uint32 augment_four) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two, uint32 augment_three, uint32 augment_four) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id, charges, attuned, augment_one, augment_two, augment_three, augment_four);
self->AddBotItem(slot_id, item_id, charges, attuned, augment_one, augment_two, augment_three, augment_four);
}
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two, uint32 augment_three, uint32 augment_four, uint32 augment_five) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two, uint32 augment_three, uint32 augment_four, uint32 augment_five) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id, charges, attuned, augment_one, augment_two, augment_three, augment_four, augment_five);
self->AddBotItem(slot_id, item_id, charges, attuned, augment_one, augment_two, augment_three, augment_four, augment_five);
}
void Lua_Bot::AddItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two, uint32 augment_three, uint32 augment_four, uint32 augment_five, uint32 augment_six) {
void Lua_Bot::AddBotItem(uint16 slot_id, uint32 item_id, int16 charges, bool attuned, uint32 augment_one, uint32 augment_two, uint32 augment_three, uint32 augment_four, uint32 augment_five, uint32 augment_six) {
Lua_Safe_Call_Void();
self->AddItem(slot_id, item_id, charges, attuned, augment_one, augment_two, augment_three, augment_four, augment_five, augment_six);
self->AddBotItem(slot_id, item_id, charges, attuned, augment_one, augment_two, augment_three, augment_four, augment_five, augment_six);
}
uint32 Lua_Bot::CountItem(uint32 item_id) {
uint32 Lua_Bot::CountBotItem(uint32 item_id) {
Lua_Safe_Call_Int();
return self->CountItem(item_id);
return self->CountBotItem(item_id);
}
Lua_Mob Lua_Bot::GetOwner() {
@@ -63,32 +63,32 @@ Lua_Mob Lua_Bot::GetOwner() {
return Lua_Mob(self->GetOwner());
}
bool Lua_Bot::HasItem(uint32 item_id) {
bool Lua_Bot::HasBotItem(uint32 item_id) {
Lua_Safe_Call_Bool();
return self->HasItem(item_id);
return self->HasBotItem(item_id);
}
void Lua_Bot::RemoveItem(uint32 item_id) {
void Lua_Bot::RemoveBotItem(uint32 item_id) {
Lua_Safe_Call_Void();
self->RemoveItem(item_id);
self->RemoveBotItem(item_id);
}
luabind::scope lua_register_bot() {
return luabind::class_<Lua_Bot, Lua_Mob>("Bot")
.def(luabind::constructor<>())
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32))&Lua_Bot::AddItem)
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32,int16))&Lua_Bot::AddItem)
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool))&Lua_Bot::AddItem)
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32))&Lua_Bot::AddItem)
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32))&Lua_Bot::AddItem)
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32,uint32))&Lua_Bot::AddItem)
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32,uint32,uint32))&Lua_Bot::AddItem)
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32,uint32,uint32,uint32))&Lua_Bot::AddItem)
.def("AddItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32,uint32,uint32,uint32,uint32))&Lua_Bot::AddItem)
.def("CountItem", (uint32(Lua_Bot::*)(uint32))&Lua_Bot::CountItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32))&Lua_Bot::AddBotItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32,int16))&Lua_Bot::AddBotItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool))&Lua_Bot::AddBotItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32))&Lua_Bot::AddBotItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32))&Lua_Bot::AddBotItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32,uint32))&Lua_Bot::AddBotItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32,uint32,uint32))&Lua_Bot::AddBotItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32,uint32,uint32,uint32))&Lua_Bot::AddBotItem)
.def("AddBotItem", (void(Lua_Bot::*)(uint16,uint32,int16,bool,uint32,uint32,uint32,uint32,uint32,uint32))&Lua_Bot::AddBotItem)
.def("CountBotItem", (uint32(Lua_Bot::*)(uint32))&Lua_Bot::CountBotItem)
.def("GetOwner", (Lua_Mob(Lua_Bot::*)(void))&Lua_Bot::GetOwner)
.def("HasItem", (bool(Lua_Bot::*)(uint32))&Lua_Bot::HasItem)
.def("RemoveItem", (void(Lua_Bot::*)(uint32))&Lua_Bot::RemoveItem);
.def("HasBotItem", (bool(Lua_Bot::*)(uint32))&Lua_Bot::HasBotItem)
.def("RemoveBotItem", (void(Lua_Bot::*)(uint32))&Lua_Bot::RemoveBotItem);
}
#endif