diff options
| author | wewlad1 <30403438+wewlad1@users.noreply.github.com> | 2018-10-16 03:18:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 03:18:51 -0700 |
| commit | 7e20b50b4fd48c8fe49bf1440dcf25910db86960 (patch) | |
| tree | 5feea820e2f8fb3675c3ce8fe8e35ba13727a045 /courtroom.cpp | |
| parent | 22640d482550fefec5406f4f819c8452f96be48d (diff) | |
| parent | d1347b2243c1595557d7b89d40eb88a68a94375b (diff) | |
Merge pull request #5 from Iamgoofball/patch-1
Fixes opus, adds opus and mp3 support to ini SFX, thanks Longbyte
Diffstat (limited to 'courtroom.cpp')
| -rw-r--r-- | courtroom.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/courtroom.cpp b/courtroom.cpp index 352a3da5..1ccae30b 100644 --- a/courtroom.cpp +++ b/courtroom.cpp @@ -6,7 +6,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow() //initializing sound device BASS_Init(-1, 48000, BASS_DEVICE_LATENCY, 0, NULL); - BASS_PluginLoad("bassopus.dll", BASS_UNICODE); + BASS_PluginLoad(L"bassopus.dll", BASS_UNICODE); keepalive_timer = new QTimer(this); keepalive_timer->start(60000); @@ -1377,7 +1377,7 @@ void Courtroom::play_sfx() if (sfx_name == "1") return; - sfx_player->play(sfx_name + ".wav"); + sfx_player->play(ao_app->get_sfx_suffix(sfx_name)); } void Courtroom::set_scene() @@ -1488,12 +1488,13 @@ void Courtroom::set_text_color() ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);" "color: yellow"); break; - default: - qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR]; + case WHITE: ui_vp_message->setStyleSheet("background-color: rgba(0, 0, 0, 0);" "color: white"); - + break; + default: + qDebug() << "W: undefined text color: " << m_chatmessage[TEXT_COLOR]; } } |