mmo-ref/gdle
1
0
Fork 0
mirror of https://gitlab.com/Scribble/gdlenhanced.git synced 2026-08-17 14:23:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

more conversions to weak pointers

Browse source
This commit is contained in:
Simon Jarrett 2018-06-21 23:32:21 +01:00
parent b08ab94319
commit e91df41c8e
21 changed files with 1201 additions and 747 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/ObjectMsgs.cpp
View file

@ -1053,16 +1053,28 @@ BinaryWriter *LoginCharacter(std::shared_ptr<CPlayerWeenie> pPlayer)
PackableList<ContentProfile> inventoryList;
for (auto item : pPlayer->m_Items)
{
std::shared_ptr<CWeenieObject> pItem = item.lock();
if (!pItem)
{
continue;
}
ContentProfile prof;
prof.m_iid = item->GetID();
prof.m_iid = pItem->GetID();
prof.m_uContainerProperties = 0;
inventoryList.push_back(prof);
}
for (auto item : pPlayer->m_Packs)
{
std::shared_ptr<CWeenieObject> pItem = item.lock();
if (!pItem)
{
continue;
}
ContentProfile prof;
prof.m_iid = item->GetID();
prof.m_uContainerProperties = item->AsContainer() ? 1 : 2;
prof.m_iid = pItem->GetID();
prof.m_uContainerProperties = pItem->AsContainer() ? 1 : 2;
inventoryList.push_back(prof);
}
inventoryList.Pack(LC);
@ -1070,10 +1082,16 @@ BinaryWriter *LoginCharacter(std::shared_ptr<CPlayerWeenie> pPlayer)
PackableList<InventoryPlacement> wieldedList;
for (auto wielded : pPlayer->m_Wielded)
{
std::shared_ptr<CWeenieObject> pItem = wielded.lock();
if (!pItem)
{
continue;
}
InventoryPlacement place;
place.iid_ = wielded->GetID();
place.loc_ = wielded->InqIntQuality(CURRENT_WIELDED_LOCATION_INT, 0);
place.priority_ = wielded->InqIntQuality(CLOTHING_PRIORITY_INT, 0);
place.iid_ = pItem->GetID();
place.loc_ = pItem->InqIntQuality(CURRENT_WIELDED_LOCATION_INT, 0);
place.priority_ = pItem->InqIntQuality(CLOTHING_PRIORITY_INT, 0);
wieldedList.push_back(place);
}
wieldedList.Pack(LC);