pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-21 13:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Cleanup] Cleanup always true/false statements in shareddb.cpp (#3189)

Browse Source 
# Notes
- `parent_index < EQ::invslot::SLOT_BEGIN` was always `false`.
- `item->LoreGroup != -1` was always `true`.
This commit is contained in:
Alex King 2023-04-05 11:21:43 -04:00 committed by GitHub
parent 49c093dc62
commit 457ce85746
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/shareddb.cpp
View File

@ -619,7 +619,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQ::InventoryProfile *inv)
}
else if (slot_id <= EQ::invbag::BANK_BAGS_END && slot_id >= EQ::invbag::BANK_BAGS_BEGIN) { // Titanium check
const auto parent_index = ((slot_id - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT);
if (parent_index < EQ::invslot::SLOT_BEGIN || parent_index >= bank_size) {
if (parent_index >= bank_size) {
cv_conflict = true;
continue;
}
@ -1564,24 +1564,28 @@ EQ::ItemInstance* SharedDatabase::CreateBaseItem(const EQ::ItemData* item, int16
if (item) {
// if maxcharges is -1 that means it is an unlimited use item.
// set it to 1 charge so that it is usable on creation
if (charges == 0 && item->MaxCharges == -1)
if (charges == 0 && item->MaxCharges == -1) {
charges = 1;
}
// Stackable items need a minimum charge of 1 to remain moveable.
if(charges <= 0 && item->Stackable)
if (charges <= 0 && item->Stackable) {
charges = 1;
}
inst = new EQ::ItemInstance(item, charges);
if (inst == nullptr) {
if (!inst) {
LogError("Error: valid item data returned a null reference for EQ::ItemInstance creation in SharedDatabase::CreateBaseItem()");
LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges);
return nullptr;
}
if(item->CharmFileID != 0 || (item->LoreGroup >= 1000 && item->LoreGroup != -1)) {
if (item->CharmFileID != 0 || item->LoreGroup >= 1000) {
inst->Initialize(this);
}
}
return inst;
}