aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authoriamgoofball <iamgoofball@gmail.com>2019-01-18 19:08:56 -0800
committerCrystalwarrior <varsash@gmail.com>2019-09-13 00:34:15 +0300
commit8a5bc8632eb69db751ded4d6034e5648208b9212 (patch)
tree25fe3282094f7b848f656c892ad958150aacecf0 /include
parent2a5cd56d5774265fb474d0767964c47272283da8 (diff)
Kill Music on Object option
(todo: actual functionality, cherrypicked from Goofball's 2.7 branch)
Diffstat (limited to 'include')
-rw-r--r--include/aoapplication.h3
-rw-r--r--include/aooptionsdialog.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/include/aoapplication.h b/include/aoapplication.h
index 19924e46..94508ff8 100644
--- a/include/aoapplication.h
+++ b/include/aoapplication.h
@@ -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();
diff --git a/include/aooptionsdialog.h b/include/aooptionsdialog.h
index 934d2577..34ae2b77 100644
--- a/include/aooptionsdialog.h
+++ b/include/aooptionsdialog.h
@@ -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;