Saving and loading of guids for items, still needs a lot of work, esp with corpses. No auditing yet

This commit is contained in:
KimLS
2023-03-06 23:59:07 -08:00
parent 593127fb7e
commit d6bdaa5c6e
8 changed files with 74 additions and 46 deletions
+1 -1
View File
@@ -2218,7 +2218,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
//do attack animation regardless of whether or not we can hit below
int16 charges = 0;
EQ::ItemInstance weapon_inst(weapon, charges);
EQ::ItemInstance weapon_inst(weapon, "", charges);
my_hit.skill = AttackAnimation(Hand, &weapon_inst, my_hit.skill);
//basically "if not immune" then do the attack
+1 -1
View File
@@ -4743,7 +4743,7 @@ uint16 EntityList::CreateGroundObject(uint32 itemid, const glm::vec4& position,
if (!is)
return 0;
auto i = new EQ::ItemInstance(is, is->MaxCharges);
auto i = new EQ::ItemInstance(is, "", is->MaxCharges);
if (!i)
return 0;
+4 -4
View File
@@ -2901,7 +2901,7 @@ void Client::DisenchantSummonedBags(bool client_update)
if (!new_id) { continue; }
auto new_item = database.GetItem(new_id);
if (!new_item) { continue; }
auto new_inst = database.CreateBaseItem(new_item);
auto new_inst = database.CreateBaseItem(new_item, "", 0);
if (!new_inst) { continue; }
if (CopyBagContents(new_inst, inst)) {
@@ -2925,7 +2925,7 @@ void Client::DisenchantSummonedBags(bool client_update)
if (!new_id) { continue; }
auto new_item = database.GetItem(new_id);
if (!new_item) { continue; }
auto new_inst = database.CreateBaseItem(new_item);
auto new_inst = database.CreateBaseItem(new_item, "", 0);
if (!new_inst) { continue; }
if (CopyBagContents(new_inst, inst)) {
@@ -2946,7 +2946,7 @@ void Client::DisenchantSummonedBags(bool client_update)
if (!new_id) { continue; }
auto new_item = database.GetItem(new_id);
if (!new_item) { continue; }
auto new_inst = database.CreateBaseItem(new_item);
auto new_inst = database.CreateBaseItem(new_item, "", 0);
if (!new_inst) { continue; }
if (CopyBagContents(new_inst, inst)) {
@@ -2967,7 +2967,7 @@ void Client::DisenchantSummonedBags(bool client_update)
if (!new_id) { break; }
auto new_item = database.GetItem(new_id);
if (!new_item) { break; }
auto new_inst = database.CreateBaseItem(new_item);
auto new_inst = database.CreateBaseItem(new_item, "", 0);
if (!new_inst) { break; }
if (CopyBagContents(new_inst, inst)) {