From 09963adfe919180f5936d048b4ab7a057134a8ff Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 14 Apr 2014 02:01:01 +0300 Subject: Add quick fix for normal right click. --- src/gui/viewport.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 46d47ab4a..c7e2b31df 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -270,13 +270,12 @@ void Viewport::logic() BLOCK_START("Viewport::logic") // Make the player follow the mouse position // if the mouse is dragged elsewhere than in a window. - followMouse(); + Gui::getMouseState(&mMouseX, &mMouseY); BLOCK_END("Viewport::logic") } void Viewport::followMouse() { - return; if (!gui) return; const uint8_t button = Gui::getMouseState(&mMouseX, &mMouseY); -- cgit v1.2.3-70-g09d2 From bcd95847a435bb3aab90bdb3c2fdada6063efc2e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 22 Apr 2014 21:54:59 +0300 Subject: Fix crash if start trade with opened storage. --- src/gui/widgets/itemcontainer.cpp | 2 +- src/gui/widgets/itemcontainer.h | 3 +++ src/gui/windows/inventorywindow.cpp | 17 ++++++++++++++++- src/gui/windows/inventorywindow.h | 2 ++ src/net/ea/inventoryhandler.cpp | 11 +++++++++++ src/net/ea/inventoryhandler.h | 2 ++ src/net/inventoryhandler.h | 2 ++ 7 files changed, 37 insertions(+), 2 deletions(-) (limited to 'src/gui') diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index ee2e35920..f24be7737 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -507,7 +507,7 @@ void ItemContainer::mouseReleased(MouseEvent &event) Net::getInventoryHandler()->moveItem(mSelectedIndex, index); selectNone(); } - else + else if (mInventory) { const DragDropSource src = dragDrop.getSource(); DragDropSource dst = DRAGDROP_SOURCE_EMPTY; diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h index f7bc44849..06e9fd459 100644 --- a/src/gui/widgets/itemcontainer.h +++ b/src/gui/widgets/itemcontainer.h @@ -131,6 +131,9 @@ class ItemContainer final : public Widget, bool getClickCount() const A_WARN_UNUSED { return mClicks; } + void unsetInventory() + { mInventory = nullptr; } + private: enum Direction { diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index c2a4b4636..01e5e052d 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -271,7 +271,8 @@ void InventoryWindow::postInit() InventoryWindow::~InventoryWindow() { invInstances.remove(this); - mInventory->removeInventoyListener(this); + if (mInventory) + mInventory->removeInventoyListener(this); if (!invInstances.empty()) invInstances.front()->updateDropButton(); @@ -681,7 +682,10 @@ void InventoryWindow::close() else { if (Net::getInventoryHandler()) + { Net::getInventoryHandler()->closeStorage(Inventory::STORAGE); + Net::getInventoryHandler()->forgotStorage(); + } scheduleDelete(); } } @@ -806,3 +810,14 @@ void InventoryWindow::setVisible(bool visible) mSortDropDown->hideDrop(); Window::setVisible(visible); } + +void InventoryWindow::unsetInventory() +{ + if (mInventory) + { + mInventory->removeInventoyListener(this); + if (mItems) + mItems->unsetInventory(); + } + mInventory = nullptr; +} diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 7e47e0362..10e1e21e2 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -152,6 +152,8 @@ class InventoryWindow final : public Window, void setVisible(bool visible) override final; + void unsetInventory(); + static bool isAnyInputFocused(); private: diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index f3c8040e1..ea7390ccb 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -486,6 +486,11 @@ void InventoryHandler::processPlayerStorageClose(Net::MessageIn &msg A_UNUSED) { // Storage access has been closed // Storage window deletes itself + if (mStorageWindow) + { + mStorageWindow->unsetInventory(); + mStorageWindow->close(); + } mStorageWindow = nullptr; if (mStorage) @@ -592,9 +597,15 @@ void InventoryHandler::closeStorage() { if (mStorageWindow) { + mStorageWindow->unsetInventory(); mStorageWindow->close(); mStorageWindow = nullptr; } } +void InventoryHandler::forgotStorage() +{ + mStorageWindow = nullptr; +} + } // namespace Ea diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h index ac88c1d6c..4546b75bb 100644 --- a/src/net/ea/inventoryhandler.h +++ b/src/net/ea/inventoryhandler.h @@ -210,6 +210,8 @@ class InventoryHandler : public Net::InventoryHandler void closeStorage() override final; + void forgotStorage() override final; + Inventory *getStorage() const { return mStorage; } diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h index 53e7d15b1..42649bae6 100644 --- a/src/net/inventoryhandler.h +++ b/src/net/inventoryhandler.h @@ -71,6 +71,8 @@ class InventoryHandler virtual void closeStorage() = 0; + virtual void forgotStorage() = 0; + virtual int convertFromServerSlot(const int eAthenaSlot) const = 0; }; -- cgit v1.2.3-70-g09d2 From 52a8b304302afd9a98274518d75b971441d7dda9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 23 Apr 2014 20:25:10 +0300 Subject: Dont check required field for enable/disable music files downloading. --- src/gui/windows/updaterwindow.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'src/gui') diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 824d8e0f6..75460cf78 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -840,21 +840,11 @@ void UpdaterWindow::logic() if (mUpdateIndex < mUpdateFiles.size()) { UpdateFile thisFile = mUpdateFiles[mUpdateIndex]; - if (!thisFile.required) + if (thisFile.type == "music" + && !config.getBoolValue("download-music")) { - // This statement checks to see if the file type - // is music, and if download-music is true - // If it fails, this statement returns true, - // and results in not downloading the file - // Else it will ignore the break, - // and download the file. - - if (!(thisFile.type == "music" - && config.getBoolValue("download-music"))) - { - mUpdateIndex++; - break; - } + mUpdateIndex++; + break; } mCurrentFile = thisFile.name; std::string checksum; -- cgit v1.2.3-70-g09d2