pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make lua Get*List entity_list functions less silly

Browse Source
This commit is contained in:
Michael Cook (mackal) 2017-03-28 14:31:10 -04:00
parent d5004dfd55
commit 138ad99eea
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/entity.h
View File

@ -461,7 +461,7 @@ public:
inline const std::unordered_map<uint16, Client *> &GetClientList() { return client_list; } inline const std::unordered_map<uint16, Client *> &GetClientList() { return client_list; }
inline const std::unordered_map<uint16, Corpse *> &GetCorpseList() { return corpse_list; } inline const std::unordered_map<uint16, Corpse *> &GetCorpseList() { return corpse_list; }
inline const std::unordered_map<uint16, Object *> &GetObjectList() { return object_list; } inline const std::unordered_map<uint16, Object *> &GetObjectList() { return object_list; }
inline const std::unordered_map<uint16, Doors *> &GetDoorList() { return door_list; } inline const std::unordered_map<uint16, Doors *> &GetDoorsList() { return door_list; }
void DepopAll(int NPCTypeID, bool StartSpawnTimer = true); void DepopAll(int NPCTypeID, bool StartSpawnTimer = true);

30
zone/lua_entity_list.cpp
View File

@ -309,12 +309,11 @@ Lua_Client Lua_EntityList::GetRandomClient(float x, float y, float z, float dist
Lua_Mob_List Lua_EntityList::GetMobList() { Lua_Mob_List Lua_EntityList::GetMobList() {
Lua_Safe_Call_Class(Lua_Mob_List); Lua_Safe_Call_Class(Lua_Mob_List);
Lua_Mob_List ret; Lua_Mob_List ret;
std::list<Mob*> t_list; auto &t_list = self->GetMobList();
self->GetMobList(t_list);
auto iter = t_list.begin(); auto iter = t_list.begin();
while(iter != t_list.end()) { while(iter != t_list.end()) {
ret.entries.push_back(Lua_Mob(*iter)); ret.entries.push_back(Lua_Mob(iter->second));
++iter; ++iter;
} }
@ -324,12 +323,11 @@ Lua_Mob_List Lua_EntityList::GetMobList() {
Lua_Client_List Lua_EntityList::GetClientList() { Lua_Client_List Lua_EntityList::GetClientList() {
Lua_Safe_Call_Class(Lua_Client_List); Lua_Safe_Call_Class(Lua_Client_List);
Lua_Client_List ret; Lua_Client_List ret;
std::list<Client*> t_list; auto &t_list = self->GetClientList();
self->GetClientList(t_list);
auto iter = t_list.begin(); auto iter = t_list.begin();
while(iter != t_list.end()) { while(iter != t_list.end()) {
ret.entries.push_back(Lua_Client(*iter)); ret.entries.push_back(Lua_Client(iter->second));
++iter; ++iter;
} }
@ -339,12 +337,11 @@ Lua_Client_List Lua_EntityList::GetClientList() {
Lua_NPC_List Lua_EntityList::GetNPCList() { Lua_NPC_List Lua_EntityList::GetNPCList() {
Lua_Safe_Call_Class(Lua_NPC_List); Lua_Safe_Call_Class(Lua_NPC_List);
Lua_NPC_List ret; Lua_NPC_List ret;
std::list<NPC*> t_list; auto &t_list = self->GetNPCList();
self->GetNPCList(t_list);
auto iter = t_list.begin(); auto iter = t_list.begin();
while(iter != t_list.end()) { while(iter != t_list.end()) {
ret.entries.push_back(Lua_NPC(*iter)); ret.entries.push_back(Lua_NPC(iter->second));
++iter; ++iter;
} }
@ -354,12 +351,11 @@ Lua_NPC_List Lua_EntityList::GetNPCList() {
Lua_Corpse_List Lua_EntityList::GetCorpseList() { Lua_Corpse_List Lua_EntityList::GetCorpseList() {
Lua_Safe_Call_Class(Lua_Corpse_List); Lua_Safe_Call_Class(Lua_Corpse_List);
Lua_Corpse_List ret; Lua_Corpse_List ret;
std::list<Corpse*> t_list; auto &t_list = self->GetCorpseList();
self->GetCorpseList(t_list);
auto iter = t_list.begin(); auto iter = t_list.begin();
while(iter != t_list.end()) { while(iter != t_list.end()) {
ret.entries.push_back(Lua_Corpse(*iter)); ret.entries.push_back(Lua_Corpse(iter->second));
++iter; ++iter;
} }
@ -369,12 +365,11 @@ Lua_Corpse_List Lua_EntityList::GetCorpseList() {
Lua_Object_List Lua_EntityList::GetObjectList() { Lua_Object_List Lua_EntityList::GetObjectList() {
Lua_Safe_Call_Class(Lua_Object_List); Lua_Safe_Call_Class(Lua_Object_List);
Lua_Object_List ret; Lua_Object_List ret;
std::list<Object*> t_list; auto &t_list = self->GetObjectList();
self->GetObjectList(t_list);
auto iter = t_list.begin(); auto iter = t_list.begin();
while(iter != t_list.end()) { while(iter != t_list.end()) {
ret.entries.push_back(Lua_Object(*iter)); ret.entries.push_back(Lua_Object(iter->second));
++iter; ++iter;
} }
@ -384,12 +379,11 @@ Lua_Object_List Lua_EntityList::GetObjectList() {
Lua_Doors_List Lua_EntityList::GetDoorsList() { Lua_Doors_List Lua_EntityList::GetDoorsList() {
Lua_Safe_Call_Class(Lua_Doors_List); Lua_Safe_Call_Class(Lua_Doors_List);
Lua_Doors_List ret; Lua_Doors_List ret;
std::list<Doors*> t_list; auto &t_list = self->GetDoorsList();
self->GetDoorsList(t_list);
auto iter = t_list.begin(); auto iter = t_list.begin();
while(iter != t_list.end()) { while(iter != t_list.end()) {
ret.entries.push_back(Lua_Door(*iter)); ret.entries.push_back(Lua_Door(iter->second));
++iter; ++iter;
} }