From 8a5bc8632eb69db751ded4d6034e5648208b9212 Mon Sep 17 00:00:00 2001
From: iamgoofball <iamgoofball@gmail.com>
Date: Fri, 18 Jan 2019 19:08:56 -0800
Subject: Kill Music on Object option (todo: actual functionality, cherrypicked
 from Goofball's 2.7 branch)

---
 include/aoapplication.h   | 3 +++
 include/aooptionsdialog.h | 2 ++
 2 files changed, 5 insertions(+)

(limited to 'include')

diff --git a/include/aoapplication.h b/include/aoapplication.h
index 19924e4..94508ff 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 934d257..34ae2b7 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;
-- 
cgit