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

[Loot] Remove from shared memory, simplification (#3988)

Browse Source 
* First pass of pulling loot out of shared memory, functional

* More code cleanup

* More cleanup

* More cleanup

* More cleanup

* Add loot reload type

* Reload, logging

* Update npc.h

* Cleanup

* Logging, don't load attempt to load loottable id 0

* Update worldserver.cpp

* Update client.cpp

* Update zone_loot.cpp

* PR feedback

* Update zone.cpp

* Memory leak suggestion

* Update CMakeLists.txt

* Post rebase issues
This commit is contained in:
Chris Miles
2024-02-05 15:17:53 -06:00
committed by GitHub
parent fcbf5cae47
commit c654c1d674
55 changed files with 1595 additions and 1890 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/perl_npc.cpp
+15 -15
View File
@@ -86,19 +86,19 @@ void Perl_NPC_RemoveItem(NPC* self, uint32 item_id, uint16 quantity, uint16 slot
self->RemoveItem(item_id, quantity, slot_id);
}
void Perl_NPC_ClearItemList(NPC* self) // @categories Inventory and Items
void Perl_NPC_ClearLootItems(NPC* self) // @categories Inventory and Items
{
self->ClearItemList();
self->ClearLootItems();
}
void Perl_NPC_AddCash(NPC* self, uint32 copper, uint32 silver, uint32 gold, uint32 platinum) // @categories Currency and Points
void Perl_NPC_AddLootCash(NPC* self, uint32 copper, uint32 silver, uint32 gold, uint32 platinum) // @categories Currency and Points
{
self->AddCash(copper, silver, gold, platinum);
self->AddLootCash(copper, silver, gold, platinum);
}
void Perl_NPC_RemoveCash(NPC* self) // @categories Currency and Points
void Perl_NPC_RemoveLootCash(NPC* self) // @categories Currency and Points
{
self->RemoveCash();
self->RemoveLootCash();
}
uint32_t Perl_NPC_CountLoot(NPC* self) // @categories Inventory and Items
@@ -620,14 +620,14 @@ int Perl_NPC_CountItem(NPC* self, uint32 item_id)
return self->CountItem(item_id);
}
uint32_t Perl_NPC_GetItemIDBySlot(NPC* self, uint16 loot_slot)
uint32_t Perl_NPC_GetLootItemIDBySlot(NPC* self, uint16 loot_slot)
{
return self->GetItemIDBySlot(loot_slot);
return self->GetLootItemIDBySlot(loot_slot);
}
int Perl_NPC_GetFirstSlotByItemID(NPC* self, uint32 item_id)
int Perl_NPC_GetFirstLootSlotByItemID(NPC* self, uint32 item_id)
{
return self->GetFirstSlotByItemID(item_id);
return self->GetFirstLootSlotByItemID(item_id);
}
float Perl_NPC_GetHealScale(NPC* self) // @categories Stats and Attributes
@@ -799,7 +799,7 @@ void perl_register_npc()
package.add("AddAISpell", (void(*)(NPC*, int16, uint16, uint32, int, int, int16))&Perl_NPC_AddSpellToNPCList);
package.add("AddAISpell", (void(*)(NPC*, int16, uint16, uint32, int, int, int16, int8, int8))&Perl_NPC_AddSpellToNPCList);
package.add("AddAISpellEffect", &Perl_NPC_AddAISpellEffect);
package.add("AddCash", &Perl_NPC_AddCash);
package.add("AddCash", &Perl_NPC_AddLootCash);
package.add("AddDefensiveProc", &Perl_NPC_AddDefensiveProc);
package.add("AddItem", (void(*)(NPC*, uint32))&Perl_NPC_AddItem);
package.add("AddItem", (void(*)(NPC*, uint32, uint16))&Perl_NPC_AddItem);
@@ -818,7 +818,7 @@ void perl_register_npc()
package.add("CalculateNewWaypoint", &Perl_NPC_CalculateNewWaypoint);
package.add("ChangeLastName", &Perl_NPC_ChangeLastName);
package.add("CheckNPCFactionAlly", &Perl_NPC_CheckNPCFactionAlly);
package.add("ClearItemList", &Perl_NPC_ClearItemList);
package.add("ClearItemList", &Perl_NPC_ClearLootItems);
package.add("ClearLastName", &Perl_NPC_ClearLastName);
package.add("CountItem", &Perl_NPC_CountItem);
package.add("CountLoot", &Perl_NPC_CountLoot);
@@ -830,14 +830,14 @@ void perl_register_npc()
package.add("GetAvoidanceRating", &Perl_NPC_GetAvoidanceRating);
package.add("GetCombatState", &Perl_NPC_GetCombatState);
package.add("GetCopper", &Perl_NPC_GetCopper);
package.add("GetFirstSlotByItemID", &Perl_NPC_GetFirstSlotByItemID);
package.add("GetFirstSlotByItemID", &Perl_NPC_GetFirstLootSlotByItemID);
package.add("GetGold", &Perl_NPC_GetGold);
package.add("GetGrid", &Perl_NPC_GetGrid);
package.add("GetGuardPointX", &Perl_NPC_GetGuardPointX);
package.add("GetGuardPointY", &Perl_NPC_GetGuardPointY);
package.add("GetGuardPointZ", &Perl_NPC_GetGuardPointZ);
package.add("GetHealScale", &Perl_NPC_GetHealScale);
package.add("GetItemIDBySlot", &Perl_NPC_GetItemIDBySlot);
package.add("GetItemIDBySlot", &Perl_NPC_GetLootItemIDBySlot);
package.add("GetKeepsSoldItems", &Perl_NPC_GetKeepsSoldItems);
package.add("GetLDoNLockedSkill", &Perl_NPC_GetLDoNLockedSkill);
package.add("GetLDoNTrapType", &Perl_NPC_GetLDoNTrapType);
@@ -900,7 +900,7 @@ void perl_register_npc()
package.add("ReloadSpells", &Perl_NPC_ReloadSpells);
package.add("RemoveAISpell", &Perl_NPC_RemoveSpellFromNPCList);
package.add("RemoveAISpellEffect", &Perl_NPC_RemoveAISpellEffect);
package.add("RemoveCash", &Perl_NPC_RemoveCash);
package.add("RemoveCash", &Perl_NPC_RemoveLootCash);
package.add("RemoveDefensiveProc", &Perl_NPC_RemoveDefensiveProc);
package.add("RemoveFromHateList", &Perl_NPC_RemoveFromHateList);
package.add("RemoveItem", (void(*)(NPC*, uint32))&Perl_NPC_RemoveItem);