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

Minor corrections (#1582)

Browse Source
This commit is contained in:
Cole-SoD 2021-10-04 17:26:02 -04:00 committed by GitHub
parent 133c1e866c
commit 61d1eeab6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/inventory_profile.cpp
View File

@ -224,7 +224,7 @@ EQ::ItemInstance* EQ::InventoryProfile::GetItem(int16 slot_id, uint8 bagidx) con
return GetItem(InventoryProfile::CalcSlotId(slot_id, bagidx)); 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) int16 EQ::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst)
{ {
if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) { if (slot_id <= EQ::invslot::POSSESSIONS_END && slot_id >= EQ::invslot::POSSESSIONS_BEGIN) {

11
zone/client_packet.cpp
View File

@ -1258,11 +1258,8 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
uint32 pplen = 0; uint32 pplen = 0;
EQApplicationPacket* outapp = nullptr; EQApplicationPacket* outapp = nullptr;
MYSQL_RES* result = nullptr;
bool loaditems = 0; bool loaditems = 0;
uint32 i;
std::string query; std::string query;
unsigned long* lengths = nullptr;
uint32 cid = CharacterID(); uint32 cid = CharacterID();
character_id = cid; /* Global character_id reference */ character_id = cid; /* Global character_id reference */
@ -1305,7 +1302,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
m_pp.platinum_shared = database.GetSharedPlatinum(this->AccountID()); m_pp.platinum_shared = database.GetSharedPlatinum(this->AccountID());
database.ClearOldRecastTimestamps(cid); /* Clear out our old recast timestamps to keep the DB clean */ 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 // item loss will occur when they use the 'empty' slots, if this is not done
m_inv.SetGMInventory(true); m_inv.SetGMInventory(true);
loaditems = database.GetInventory(cid, &m_inv); /* Load Character Inventory */ loaditems = database.GetInventory(cid, &m_inv); /* Load Character Inventory */
@ -1735,12 +1732,12 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
Character Inventory Packet Character Inventory Packet
this is not quite where live sends inventory, they do it after tribute 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) if (admin >= minStatusToBeGM)
m_inv.SetGMInventory(true); // set to true to allow expansion-restricted packets through m_inv.SetGMInventory(true); // set to true to allow expansion-restricted packets through
BulkSendInventoryItems(); 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) { for (auto iter = m_inv.cursor_cbegin(); iter != m_inv.cursor_cend(); ++iter) {
/* First item cursor is sent in bulk inventory packet */ /* First item cursor is sent in bulk inventory packet */
if (iter == m_inv.cursor_cbegin()) if (iter == m_inv.cursor_cbegin())
@ -1807,7 +1804,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
/* /*
Weather Packet 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) uses to advance to the next state (sending ReqNewZone)
*/ */
outapp = new EQApplicationPacket(OP_Weather, 12); outapp = new EQApplicationPacket(OP_Weather, 12);