mirror of
https://github.com/EQEmu/Server.git
synced 2026-03-03 02:52:26 +00:00
Update shareddb.cpp
This commit is contained in:
parent
003183a6af
commit
748cf5fcda
@ -712,7 +712,7 @@ bool SharedDatabase::GetInventory(Client *c)
|
|||||||
row.augment_six
|
row.augment_six
|
||||||
};
|
};
|
||||||
|
|
||||||
if (EQ::ValueWithin(slot_id, EQ::invslot::POSSESSIONS_END, EQ::invslot::POSSESSIONS_BEGIN)) {
|
if (EQ::ValueWithin(slot_id, EQ::invslot::POSSESSIONS_BEGIN, EQ::invslot::POSSESSIONS_END)) {
|
||||||
// Titanium thru UF check
|
// Titanium thru UF check
|
||||||
if (((static_cast<uint64>(1) << slot_id) & pmask) == 0) {
|
if (((static_cast<uint64>(1) << slot_id) & pmask) == 0) {
|
||||||
cv_conflict = true;
|
cv_conflict = true;
|
||||||
@ -725,7 +725,7 @@ bool SharedDatabase::GetInventory(Client *c)
|
|||||||
cv_conflict = true;
|
cv_conflict = true;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
} else if (EQ::ValueWithin(slot_id, EQ::invslot::BANK_END, EQ::invslot::BANK_BEGIN)) {
|
} else if (EQ::ValueWithin(slot_id, EQ::invslot::BANK_BEGIN, EQ::invslot::BANK_END)) {
|
||||||
// Titanium check
|
// Titanium check
|
||||||
if ((slot_id - EQ::invslot::BANK_BEGIN) >= bank_size) {
|
if ((slot_id - EQ::invslot::BANK_BEGIN) >= bank_size) {
|
||||||
cv_conflict = true;
|
cv_conflict = true;
|
||||||
@ -852,7 +852,7 @@ bool SharedDatabase::GetInventory(Client *c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int16 put_slot_id;
|
int16 put_slot_id;
|
||||||
if (slot_id > EQ::invbag::TRADE_BAGS_END) {
|
if (EQ::ValueWithin(slot_id, EQ::invbag::CURSOR_BAG_BEGIN, EQ::invbag::CURSOR_BAG_END) || slot_id == EQ::invslot::slotCursor) {
|
||||||
put_slot_id = inv.PushCursor(*inst);
|
put_slot_id = inv.PushCursor(*inst);
|
||||||
} else {
|
} else {
|
||||||
put_slot_id = inv.PutItem(slot_id, *inst);
|
put_slot_id = inv.PutItem(slot_id, *inst);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user