From cfbb335f67a350cf23adb62ee536330312185f58 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 28 Jun 2015 23:29:59 +0300 Subject: Remove some ueseless checks. --- src/gui/windows/equipmentwindow.cpp | 5 +---- src/gui/windows/inventorywindow.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index ef060ec83..784a7d86c 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -712,11 +712,8 @@ void EquipmentWindow::loadSlot(const XmlNodePtr slotNode, const int imageIndex = XML::getProperty(slotNode, "image", -1); Image *image = nullptr; - if (imageset && imageIndex >= 0 && imageIndex - < static_cast(imageset->size())) - { + if (imageIndex >= 0 && imageIndex < static_cast(imageset->size())) image = imageset->get(imageIndex); - } std::vector &boxes = mPages[page]->boxes; if (boxes[slot]) diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index a57565d7f..d4f27fd74 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -327,7 +327,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) : invInstances.push_back(this); - if (inventory && inventory->isMainInventory()) + if (inventory->isMainInventory()) { updateDropButton(); } -- cgit v1.2.3-70-g09d2