Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bug Fix] Minor corrections #1582

Merged
merged 1 commit into from Oct 4, 2021
Merged

[Bug Fix] Minor corrections #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/inventory_profile.cpp
View file
Open in desktop
Expand Up @@ -224,7 +224,7 @@ EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id, uint8 bagidx) con
return GetItem(InventoryProfile::CalcSlotId(slot_id, bagidx));
}

// Put an item snto specified slot
// Put an item into specified slot
int16 EQ::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst)
{
if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) {
Expand Down
11 changes: 4 additions & 7 deletions zone/client_packet.cpp
View file
Open in desktop
Expand Up @@ -1256,11 +1256,8 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)

uint32 pplen = 0;
EQApplicationPacket* outapp = nullptr;
MYSQL_RES* result = nullptr;
bool loaditems = 0;
uint32 i;
std::string query;
unsigned long* lengths = nullptr;

uint32 cid = CharacterID();
character_id = cid; /* Global character_id reference */
Expand Down Expand Up @@ -1303,7 +1300,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
m_pp.platinum_shared = database.GetSharedPlatinum(this->AccountID());

database.ClearOldRecastTimestamps(cid); /* Clear out our old recast timestamps to keep the DB clean */
// set to full support in case they're a gm with items in disabled expansion slots..but, have their gm flag off...
// set to full support in case they're a gm with items in disabled expansion slots...but, have their gm flag off...
// item loss will occur when they use the 'empty' slots, if this is not done
m_inv.SetGMInventory(true);
loaditems = database.GetInventory(cid, &m_inv); /* Load Character Inventory */
Expand Down Expand Up @@ -1733,12 +1730,12 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
Character Inventory Packet
this is not quite where live sends inventory, they do it after tribute
*/
if (loaditems) { /* Dont load if a length error occurs */
if (loaditems) { /* Don't load if a length error occurs */
if (admin >= minStatusToBeGM)
m_inv.SetGMInventory(true); // set to true to allow expansion-restricted packets through

BulkSendInventoryItems();
/* Send stuff on the cursor which isnt sent in bulk */
/* Send stuff on the cursor which isn't sent in bulk */
for (auto iter = m_inv.cursor_cbegin(); iter != m_inv.cursor_cend(); ++iter) {
/* First item cursor is sent in bulk inventory packet */
if (iter == m_inv.cursor_cbegin())
Expand Down Expand Up @@ -1805,7 +1802,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)

/*
Weather Packet
This shouldent be moved, this seems to be what the client
This shouldn't be moved, this seems to be what the client
uses to advance to the next state (sending ReqNewZone)
*/
outapp = new EQApplicationPacket(OP_Weather, 12);
Expand Down