Revert "Attempt at adding auction dialog functionality"

This reverts commit e134889.
Illarion-eV · Jun 18, 2024 · 47b43be · 47b43be
1 parent e134889
commit 47b43be
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 470 deletions.
diff --git a/src/Character.cpp b/src/Character.cpp
@@ -1472,10 +1472,6 @@ void Character::requestMerchantDialog(MerchantDialog *merchantDialog) {
     // Nothing to do here, overloaded in Player
 }
 
-void Character::requestAuctionDialog(AuctionDialog *auctionDialog) {
-    // Nothing to do here, overloaded in Player
-}
-
 void Character::requestSelectionDialog(SelectionDialog *selectionDialog) {
     // Nothing to do here, overloaded in Player
 }

diff --git a/src/Character.hpp b/src/Character.hpp
@@ -30,7 +30,6 @@
 #include "dialog/CraftingDialog.hpp"
 #include "dialog/InputDialog.hpp"
 #include "dialog/MerchantDialog.hpp"
-#include "dialog/AuctionDialog.hpp"
 #include "dialog/MessageDialog.hpp"
 #include "dialog/SelectionDialog.hpp"
 #include "tuningConstants.hpp"
@@ -429,7 +428,6 @@ class Character {
     virtual void requestInputDialog(InputDialog *inputDialog);
     virtual void requestMessageDialog(MessageDialog *messageDialog);
     virtual void requestMerchantDialog(MerchantDialog *merchantDialog);
-    virtual void requestAuctionDialog(AuctionDialog *auctionDialog);
     virtual void requestSelectionDialog(SelectionDialog *selectionDialog);
     virtual void requestCraftingDialog(CraftingDialog *craftingDialog);
     virtual void requestCraftingLookAt(unsigned int dialogId, ItemLookAt &lookAt);

diff --git a/src/Player.cpp b/src/Player.cpp
@@ -39,7 +39,6 @@
 #include "dialog/CraftingDialog.hpp"
 #include "dialog/InputDialog.hpp"
 #include "dialog/MerchantDialog.hpp"
-#include "dialog/AuctionDialog.hpp"
 #include "dialog/MessageDialog.hpp"
 #include "dialog/SelectionDialog.hpp"
 #include "map/Field.hpp"
@@ -2546,53 +2545,6 @@ void Player::executeMerchantDialogLookAt(unsigned int dialogId, uint8_t list, ui
     }
 }
 
-void Player::requestAuctionDialog(AuctionDialog *auctionDialog) {
-    requestDialog<AuctionDialog, AuctionDialogTC>(auctionDialog);
-}
-
-void Player::executeAuctionDialogAbort(unsigned int dialogId) {
-    auto auctionDialog = getDialog<AuctionDialog>(dialogId);
-
-    if (auctionDialog) {
-        auctionDialog->setResult(AuctionDialog::playerAborts);
-        auctionDialog->setPurchaseIndex(0);
-        auctionDialog->setPurchaseAmount(0);
-        ScriptItem item;
-        auctionDialog->setSaleItem(item);
-        LuaScript::executeDialogCallback(*auctionDialog);
-    }
-
-    dialogs.erase(dialogId);
-}
-
-void Player::executeAuctionDialogBid(unsigned int dialogId, AuctionDialog::index_type index,
-                                      Item::number_type amount) const {
-    auto auctionDialog = getDialog<AuctionDialog>(dialogId);
-
-    if (auctionDialog) {
-        auctionDialog->setResult(AuctionDialog::playerBids);
-        auctionDialog->setPurchaseIndex(index);
-        auctionDialog->setPurchaseAmount(amount);
-        ScriptItem item;
-        auctionDialog->setSaleItem(item);
-        LuaScript::executeDialogCallback(*auctionDialog);
-    }
-}
-
-void Player::executeAuctionDialogLookAt(unsigned int dialogId, uint8_t list, uint8_t slot) {
-    auto auctionDialog = getDialog<AuctionDialog>(dialogId);
-
-    if (auctionDialog) {
-        auctionDialog->setResult(AuctionDialog::playerLooksAt);
-        auctionDialog->setLookAtList(static_cast<AuctionDialog::ListType>(list));
-        auctionDialog->setPurchaseIndex(slot);
-        auto lookAt = LuaScript::executeDialogCallback<ItemLookAt>(*auctionDialog);
-
-        ServerCommandPointer cmd = std::make_shared<LookAtDialogGroupItemTC>(dialogId, list, slot, lookAt);
-        Connection->addCommand(cmd);
-    }
-}
-
 void Player::requestSelectionDialog(SelectionDialog *selectionDialog) {
     requestDialog<SelectionDialog, SelectionDialogTC>(selectionDialog);
 }

diff --git a/src/Player.hpp b/src/Player.hpp
@@ -23,7 +23,6 @@
 #include "Item.hpp"
 #include "Showcase.hpp"
 #include "dialog/MerchantDialog.hpp"
-#include "dialog/AuctionDialog.hpp"
 #include "dialog/SelectionDialog.hpp"
 #include "netinterface/BasicServerCommand.hpp"
 #include "netinterface/NetInterface.hpp"
@@ -510,12 +509,6 @@ class Player : public Character {
                                    Item::number_type amount);
     void executeMerchantDialogLookAt(unsigned int dialogId, uint8_t list, uint8_t slot);
 
-    void requestAuctionDialog(AuctionDialog *auctionDialog) override;
-    void executeAuctionDialogAbort(unsigned int dialogId);
-    void executeAuctionDialogBid(unsigned int dialogId, AuctionDialog::index_type index,
-                                  Item::number_type amount) const;
-    void executeAuctionDialogLookAt(unsigned int dialogId, uint8_t list, uint8_t slot);
-
     void requestSelectionDialog(SelectionDialog *selectionDialog) override;
     void executeSelectionDialog(unsigned int dialogId, bool success, SelectionDialog::index_type index);
 

diff --git a/src/dialog/AuctionDialog.cpp b/src/dialog/AuctionDialog.cpp
diff --git a/src/dialog/AuctionDialog.hpp b/src/dialog/AuctionDialog.hpp
diff --git a/src/dialog/CMakeLists.txt b/src/dialog/CMakeLists.txt
@@ -7,7 +7,6 @@ target_sources( dialog
         Dialog.cpp
         InputDialog.cpp
         MerchantDialog.cpp
-        AuctionDialog.cpp
         MessageDialog.cpp
         SelectionDialog.cpp
 )

diff --git a/src/netinterface/CommandFactory.cpp b/src/netinterface/CommandFactory.cpp
@@ -27,7 +27,6 @@ CommandFactory::CommandFactory() {
     templateList[C_MESSAGEDIALOG_TS] = std::make_unique<MessageDialogTS>();
     templateList[C_INPUTDIALOG_TS] = std::make_unique<InputDialogTS>();
     templateList[C_MERCHANTDIALOG_TS] = std::make_unique<MerchantDialogTS>();
-    templateList[C_AUCTIONDIALOG_TS] = std::make_unique<AuctionDialogTS>();
     templateList[C_SELECTIONDIALOG_TS] = std::make_unique<SelectionDialogTS>();
     templateList[C_CRAFTINGDIALOG_TS] = std::make_unique<CraftingDialogTS>();
     templateList[C_LOGIN_TS] = std::make_unique<LoginCommandTS>();