Kill Music on Object option

(todo: actual functionality, cherrypicked from Goofball's 2.7 branch)
This commit is contained in:
iamgoofball 2019-01-18 19:08:56 -08:00 committed by Crystalwarrior
parent 2a5cd56d57
commit 8a5bc8632e
5 changed files with 25 additions and 2 deletions

View File

@ -16,13 +16,13 @@ HEADERS += $$files($$PWD/include/*.h)
LIBS += -L$$PWD/lib
#DEFINES += DISCORD
DEFINES += DISCORD
contains(DEFINES, DISCORD) {
LIBS += -ldiscord-rpc
}
#DEFINES += BASSAUDIO
DEFINES += BASSAUDIO
contains(DEFINES, BASSAUDIO) {
LIBS += -lbass

View File

@ -150,6 +150,9 @@ public:
//Returns true if blank blips is enabled in config.ini and false otherwise
bool get_blank_blip();
//Returns true if kill music on object is enabled in the config.ini
bool get_objectmusic();
//Returns the value of default_music in config.ini
int get_default_music();

View File

@ -88,6 +88,8 @@ private:
QLabel *ui_bliprate_lbl;
QCheckBox *ui_blank_blips_cb;
QLabel *ui_blank_blips_lbl;
QLabel *ui_objectmusic_lbl;
QCheckBox *ui_objectmusic_cb;
QDialogButtonBox *ui_settings_buttons;
QWidget *ui_casing_tab;

View File

@ -334,6 +334,17 @@ AOOptionsDialog::AOOptionsDialog(QWidget *parent, AOApplication *p_ao_app) : QDi
ui_audio_layout->setWidget(7, QFormLayout::FieldRole, ui_blank_blips_cb);
ui_objectmusic_lbl = new QLabel(ui_audio_widget);
ui_objectmusic_lbl->setText(tr("Kill Music On Objection:"));
ui_objectmusic_lbl->setToolTip(tr("If true, the game will stop music when someone objects, like in the actual games."));
ui_audio_layout->setWidget(9, QFormLayout::LabelRole, ui_objectmusic_lbl);
ui_objectmusic_cb = new QCheckBox(ui_audio_widget);
ui_objectmusic_cb->setChecked(p_ao_app->get_objectmusic());
ui_audio_layout->setWidget(9, QFormLayout::FieldRole, ui_objectmusic_cb);
// The casing tab!
ui_casing_tab = new QWidget();
ui_settings_tabs->addTab(ui_casing_tab, tr("Casing"));
@ -506,6 +517,7 @@ void AOOptionsDialog::save_pressed()
configini->setValue("default_blip", ui_blips_volume_spinbox->value());
configini->setValue("blip_rate", ui_bliprate_spinbox->value());
configini->setValue("blank_blip", ui_blank_blips_cb->isChecked());
configini->setValue("kill_music_on_object", ui_objectmusic_cb->isChecked());
configini->setValue("casing_enabled", ui_casing_enabled_cb->isChecked());
configini->setValue("casing_defence_enabled", ui_casing_def_cb->isChecked());

View File

@ -602,6 +602,12 @@ bool AOApplication::get_blank_blip()
return result.startsWith("true");
}
bool AOApplication::get_objectmusic()
{
QString result = configini->value("kill_music_on_object", "true").value<QString>();
return result.startsWith("true");
}
bool AOApplication::is_discord_enabled()
{
QString result = configini->value("discord", "true").value<QString>();