From 3db23328218969fdb10fae5eaf2ed3166aae6fa4 Mon Sep 17 00:00:00 2001 From: Uleat Date: Sun, 19 Oct 2014 22:30:45 -0400 Subject: [PATCH] Missed one! --- zone/command.cpp | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/zone/command.cpp b/zone/command.cpp index 93c718bce..33f7c2068 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -2812,6 +2812,16 @@ void command_peekinv(Client *c, const Seperator *sep) c->Message((item == 0), "WornSlot: %i, Item: %i (%s), Charges: %i", i, ((item == 0) ? 0 : item->ID), linkbase.c_str(), ((item == 0) ? 0 : inst->GetCharges())); } + if (c->GetClientVersion() >= EQClientSoF) + { + const ItemInst* inst = client->GetInv().GetItem(MainPowerSource); + item = (inst) ? inst->GetItem() : nullptr; + + linkbase = StringFormat(linkcore, 0x12, ((item == 0) ? 0 : item->ID), ((item == 0) ? "null" : item->Name), 0x12); + c->Message((item == 0), "WornSlot: %i, Item: %i (%s), Charges: %i", + MainPowerSource, ((item == 0) ? 0 : item->ID), linkbase.c_str(), ((item == 0) ? 0 : inst->GetCharges())); + } + } if (bAll || (strcasecmp(sep->arg[1], "inv")==0)) { @@ -2836,15 +2846,6 @@ void command_peekinv(Client *c, const Seperator *sep) } } } - if(c->GetClientVersion() >= EQClientSoF) - { - const ItemInst* inst = client->GetInv().GetItem(MainPowerSource); - item = (inst) ? inst->GetItem() : nullptr; - - linkbase = StringFormat(linkcore, 0x12, ((item == 0) ? 0 : item->ID), ((item == 0) ? "null" : item->Name), 0x12); - c->Message((item == 0), "WornSlot: %i, Item: %i (%s), Charges: %i", - MainPowerSource, ((item == 0) ? 0 : item->ID), linkbase.c_str(), ((item == 0) ? 0 : inst->GetCharges())); - } } // Changed to show 'empty' cursors and not to show bag slots on 'queued' cursor slots (cursor bag slots 331 to 340 are not arrayed...) @@ -2867,7 +2868,7 @@ void command_peekinv(Client *c, const Seperator *sep) linkbase = StringFormat(linkcore, 0x12, ((item == 0) ? 0 : item->ID), ((item == 0) ? "null" : item->Name), 0x12); c->Message((item == 0), "CursorSlot: %i, Depth: %i, Item: %i (%s), Charges: %i", - MainPowerSource, i, ((item == 0) ? 0 : item->ID), linkbase.c_str(), ((item == 0) ? 0 : inst->GetCharges())); + MainCursor, i, ((item == 0) ? 0 : item->ID), linkbase.c_str(), ((item == 0) ? 0 : inst->GetCharges())); if (inst && inst->IsType(ItemClassContainer) && i==0) { // 'CSD 1' - only display contents of slot 30[0] container..higher ones don't exist for (uint8 j = SUB_BEGIN; j < EmuConstants::ITEM_CONTAINER_SIZE; j++) { @@ -2876,7 +2877,7 @@ void command_peekinv(Client *c, const Seperator *sep) linkbase = StringFormat(linkcore, 0x12, ((item == 0) ? 0 : item->ID), ((item == 0) ? "null" : item->Name), 0x12); c->Message((item == 0), " CursorBagSlot: %i (Slot #%i, Bag #%i), Item: %i (%s), Charges: %i", - Inventory::CalcSlotId(i, j), i, j, ((item == 0) ? 0 : item->ID), linkbase.c_str(), ((item == 0) ? 0 : inst->GetCharges())); + Inventory::CalcSlotId(MainCursor, j), MainCursor, j, ((item == 0) ? 0 : item->ID), linkbase.c_str(), ((item == 0) ? 0 : inst->GetCharges())); } } }