diff --git a/Source/Client/Mode/GameModePackets.cpp b/Source/Client/Mode/GameModePackets.cpp index 5b692281..7fba57bc 100644 --- a/Source/Client/Mode/GameModePackets.cpp +++ b/Source/Client/Mode/GameModePackets.cpp @@ -1882,7 +1882,7 @@ void __stdcall sub_D08110(int field8, int itemIdWord, int quantityWord, int fiel } else if (g_vendingOpenResultWindow != nullptr) { g_vendingOpenResultWindow->SendMsg(nullptr, 0x17, 0, 0, 0, 0); } - if (g_vendingOpenResultWindow != nullptr && g_vendingSaleAlarm) { + if (g_vendingOpenResultWindow != nullptr && g_session.m_muteSellSound) { g_soundMgr->PlayWave("effect\\ef_steal.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); } } @@ -1903,7 +1903,7 @@ void __declspec(noinline) __stdcall sub_D08670(int field14, int itemId, int quan if (g_saleResultWindow != nullptr) { g_saleResultWindow->SendMsg(nullptr, 0x77, fieldC, 0, 0, 0); g_saleResultWindow->SendMsg(nullptr, 0x17, 0, 0, 0, 0); - if (g_vendingSaleAlarm) { + if (g_session.m_muteSellSound) { g_soundMgr->PlayWave("effect\\ef_steal.wav", 0.0f, 0.0f, 0.0f, 250, 40, 1.0f, 0); } if (g_session.GetList9Size() == 0) { diff --git a/Source/UI/Edit/UIEditCtrl.cpp b/Source/UI/Edit/UIEditCtrl.cpp index 3760f5eb..e46ac9e9 100644 --- a/Source/UI/Edit/UIEditCtrl.cpp +++ b/Source/UI/Edit/UIEditCtrl.cpp @@ -109,8 +109,6 @@ #include "UI/Rodex/UIRodexComposeWnd.h" #include "UI/UIBartermarketWnd.h" #include "UI/Edit/UIEditPaint.inl" -// GLOBAL: gl_24862 -bool g_vendingSaleAlarm; // GLOBAL: gl_24653 int g_skillTooltipActive; @@ -3628,7 +3626,7 @@ void UIMerchantItemMyShopWnd::OpenShop() { this->AddChild(this->actionButton); } - g_vendingSaleAlarm = false; + g_session.m_muteSellSound = false; this->saleAlarm->Show(0); const int previousHeight = this->unknown_011C; @@ -6823,7 +6821,7 @@ void UIMerchantItemMyShopWnd::Slot15(int width, int height) { this->saleAlarm->SetImages("유저인터페이스\\checkbox_1.bmp", "유저인터페이스\\checkbox_0.bmp", LookupMessage(this->unknown_0100 ? 2698 : 2642)); this->saleAlarm->FitToText(); this->saleAlarm->Move(12, this->unknown_0100 ? this->geometry.height - 12 : this->geometry.height - 18); - this->saleAlarm->SetChecked(g_vendingSaleAlarm); + this->saleAlarm->SetChecked(g_session.m_muteSellSound); this->AddChild(this->saleAlarm); const std::string prefix("유저인터페이스\\"); diff --git a/Source/UI/Shop/UIMerchantItemMyShopWnd.h b/Source/UI/Shop/UIMerchantItemMyShopWnd.h index 003cb76d..7aedb57c 100644 --- a/Source/UI/Shop/UIMerchantItemMyShopWnd.h +++ b/Source/UI/Shop/UIMerchantItemMyShopWnd.h @@ -11,8 +11,6 @@ class UIBasicButton; class UICheckBox; class UIStaticText; -extern bool g_vendingSaleAlarm; - class UIMerchantItemMyShopWnd : public UIItemBaseWnd { public: UIMerchantItemMyShopWnd(int value);