oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

GUIFormSpecMenu: Fix parameter order

Browse source 
Fixes a regression caused by e51f47461 because C++ implicitly converts boolean to float. no matter what.
This commit is contained in:
SmallJoker 2022-07-10 15:34:53 +02:00
parent fae8726a76
commit 8724fe6e3f
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/gui/guiFormSpecMenu.cpp
View file

@ -4498,7 +4498,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
if ((s.ftype == f_TabHeader) && if ((s.ftype == f_TabHeader) &&
(s.fid == event.GUIEvent.Caller->getID())) { (s.fid == event.GUIEvent.Caller->getID())) {
if (!s.sound.empty() && m_sound_manager) if (!s.sound.empty() && m_sound_manager)
m_sound_manager->playSound(SimpleSoundSpec(s.sound, false, 1.0f)); m_sound_manager->playSound(SimpleSoundSpec(s.sound, 1.0f));
s.send = true; s.send = true;
acceptInput(); acceptInput();
s.send = false; s.send = false;
@ -4543,7 +4543,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
if (s.ftype == f_Button || s.ftype == f_CheckBox) { if (s.ftype == f_Button || s.ftype == f_CheckBox) {
if (!s.sound.empty() && m_sound_manager) if (!s.sound.empty() && m_sound_manager)
m_sound_manager->playSound(SimpleSoundSpec(s.sound, false, 1.0f)); m_sound_manager->playSound(SimpleSoundSpec(s.sound, 1.0f));
s.send = true; s.send = true;
if (s.is_exit) { if (s.is_exit) {
@ -4568,7 +4568,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
} }
} }
if (!s.sound.empty() && m_sound_manager) if (!s.sound.empty() && m_sound_manager)
m_sound_manager->playSound(SimpleSoundSpec(s.sound, false, 1.0f)); m_sound_manager->playSound(SimpleSoundSpec(s.sound, 1.0f));
s.send = true; s.send = true;
acceptInput(quit_mode_no); acceptInput(quit_mode_no);
@ -4586,7 +4586,7 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
s.fdefault = L""; s.fdefault = L"";
} else if (s.ftype == f_Unknown || s.ftype == f_HyperText) { } else if (s.ftype == f_Unknown || s.ftype == f_HyperText) {
if (!s.sound.empty() && m_sound_manager) if (!s.sound.empty() && m_sound_manager)
m_sound_manager->playSound(SimpleSoundSpec(s.sound, false, 1.0f)); m_sound_manager->playSound(SimpleSoundSpec(s.sound, 1.0f));
s.send = true; s.send = true;
acceptInput(); acceptInput();
s.send = false; s.send = false;