From 5fc7ef5ed9394e613341cd4f98d908bb8483b2fd Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 23 Dec 2017 19:37:38 +0300 Subject: Remove default parameters from outfitswindow. --- src/gui/windows/outfitwindow.cpp | 23 +++++++++++++++++------ src/gui/windows/outfitwindow.h | 9 +++++---- 2 files changed, 22 insertions(+), 10 deletions(-) (limited to 'src/gui') diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 3d190ad00..de6319b4c 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -254,7 +254,9 @@ void OutfitWindow::action(const ActionEvent &event) } else if (eventId == "equip") { - wearOutfit(mCurrentOutfit); + wearOutfit(mCurrentOutfit, + true, + false); if (Game::instance() != nullptr) Game::instance()->setValidSpeed(); } @@ -266,7 +268,8 @@ void OutfitWindow::action(const ActionEvent &event) } } -void OutfitWindow::wearOutfit(const int outfit, const bool unwearEmpty, +void OutfitWindow::wearOutfit(const int outfit, + const bool unwearEmpty, const bool select) { bool isEmpty = true; @@ -647,7 +650,9 @@ void OutfitWindow::wearNextOutfit(const bool all) } } } - wearOutfit(mCurrentOutfit); + wearOutfit(mCurrentOutfit, + true, + false); } void OutfitWindow::wearPreviousOutfit(const bool all) @@ -669,7 +674,9 @@ void OutfitWindow::wearPreviousOutfit(const bool all) } } } - wearOutfit(mCurrentOutfit); + wearOutfit(mCurrentOutfit, + true, + false); } void OutfitWindow::copyFromEquiped() @@ -701,12 +708,16 @@ void OutfitWindow::copyFromEquiped(const int dst) void OutfitWindow::wearAwayOutfit() { copyFromEquiped(OUTFITS_COUNT); - wearOutfit(mAwayOutfit, false); + wearOutfit(mAwayOutfit, + false, + false); } void OutfitWindow::unwearAwayOutfit() { - wearOutfit(OUTFITS_COUNT); + wearOutfit(OUTFITS_COUNT, + true, + false); } void OutfitWindow::clearCurrentOutfit() diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index cf2799d2b..14c7fd3ce 100644 --- a/src/gui/windows/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h @@ -66,8 +66,9 @@ class OutfitWindow final : public Window, void load(); - void wearOutfit(const int outfit, const bool unwearEmpty = true, - const bool select = false); + void wearOutfit(const int outfit, + const bool unwearEmpty, + const bool select); void copyOutfit(const int outfit); @@ -83,9 +84,9 @@ class OutfitWindow final : public Window, void previous(); - void wearNextOutfit(const bool all = false); + void wearNextOutfit(const bool all); - void wearPreviousOutfit(const bool all = false); + void wearPreviousOutfit(const bool all); void wearAwayOutfit(); -- cgit v1.2.3-70-g09d2