You can now adjust master volumes in settings

Changes may not take effect until restarting the game. It seems some
singletons are initialized when needed, then they are reused for each
mission, but have sound volume assigned at awkward times.

3 files changed, 100 insertions, 28 deletions

diff --git a/data/content/Content/content.txt b/data/content/Content/content.txt
index 2a16b75..d37a367 100644
--- a/data/content/Content/content.txt
+++ b/data/content/Content/content.txt
@@ -597,6 +597,9 @@ form.options.tab.controls   = Controls
 form.options.tab.gameplay   = Gameplay
 form.options.tab.mods       = Mod Config
 
+form.audio.volume.master    = Master Volume:
+form.audio.volume.music     = Music Volume:
+form.audio.volume.world     = World Volume:
 form.audio.volume.effects   = Effects Volume:
 form.audio.volume.gui       = GUI Volume:
 form.audio.volume.warning   = Warning Volume:
diff --git a/data/content/Screens/AudDlg.frm b/data/content/Screens/AudDlg.frm
index cb99410..8f82287 100644
--- a/data/content/Screens/AudDlg.frm
+++ b/data/content/Screens/AudDlg.frm
@@ -148,8 +148,8 @@ form: {
          x_mins:     ( 20, 100, 100,  20, 100, 100,  20)
          x_weights:  (0.2, 0.3, 0.3, 0.2, 0.3, 0.3, 0.2)
 
-         y_mins:     ( 20,  25,  25,  25,  25,  25,  25,  25,  20)
-         y_weights:  (0.3,   0,   0,   0,   0,   0,   0,   0, 0.7)
+         y_mins:     ( 20,  25,  25,  25,  25,  25,  25,  25,  25,  25,  25,  20)
+         y_weights:  (0.3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0.7)
       }
    }
 
@@ -164,11 +164,35 @@ form: {
    },
 
    ctrl: {
+      id:               107
+      pid:              300
+      type:             label
+      text:             "form.audio.volume.master"
+      cells:            (1,1,1,1)
+   },
+
+   ctrl: {
+      id:               108
+      pid:              300
+      type:             label
+      text:             "form.audio.volume.music"
+      cells:            (1,2,1,1)
+   },
+
+   ctrl: {
+      id:               109
+      pid:              300
+      type:             label
+      text:             "form.audio.volume.world"
+      cells:            (1,3,1,1)
+   },
+
+   ctrl: {
       id:               101
       pid:              300
       type:             label
       text:             "form.audio.volume.effects"
-      cells:            (1,1,1,1)
+      cells:            (1,4,1,1)
    },
 
    ctrl: {
@@ -176,7 +200,7 @@ form: {
       pid:              300
       type:             label
       text:             "form.audio.volume.gui"
-      cells:            (1,2,1,1)
+      cells:            (1,5,1,1)
    },
 
    ctrl: {
@@ -184,7 +208,7 @@ form: {
       pid:              300
       type:             label
       text:             "form.audio.volume.warning"
-      cells:            (1,3,1,1)
+      cells:            (1,6,1,1)
    },
 
    ctrl: {
@@ -192,7 +216,7 @@ form: {
       pid:              300
       type:             label
       text:             "form.audio.volume.vox"
-      cells:            (1,4,1,1)
+      cells:            (1,7,1,1)
    },
 
    ctrl: {
@@ -200,7 +224,7 @@ form: {
       pid:              300
       type:             label
       text:             "form.audio.music.menu"
-      cells:            (1,6,1,1)
+      cells:            (1,8,1,1)
    },
 
    ctrl: {
@@ -208,7 +232,7 @@ form: {
       pid:              300
       type:             label
       text:             "form.audio.music.game"
-      cells:            (1,7,1,1)
+      cells:            (1,9,1,1)
    },
 
    defctrl: {
@@ -225,47 +249,68 @@ form: {
    },
 
    ctrl: {
-      id:               201
+      id:               207
       pid:              300
       type:             slider
       cells:            (2,1,1,1)
    },
 
    ctrl: {
-      id:               202
+      id:               208
       pid:              300
       type:             slider
       cells:            (2,2,1,1)
    },
 
    ctrl: {
-      id:               203
+      id:               209
       pid:              300
       type:             slider
       cells:            (2,3,1,1)
    },
 
    ctrl: {
-      id:               204
+      id:               201
       pid:              300
       type:             slider
       cells:            (2,4,1,1)
    },
 
    ctrl: {
-      id:               205
+      id:               202
+      pid:              300
+      type:             slider
+      cells:            (2,5,1,1)
+   },
+
+   ctrl: {
+      id:               203
       pid:              300
       type:             slider
       cells:            (2,6,1,1)
    },
 
    ctrl: {
-      id:               206
+      id:               204
       pid:              300
       type:             slider
       cells:            (2,7,1,1)
    },
 
+   ctrl: {
+      id:               205
+      pid:              300
+      type:             slider
+      cells:            (2,8,1,1)
+   },
+
+   ctrl: {
+      id:               206
+      pid:              300
+      type:             slider
+      cells:            (2,9,1,1)
+   },
+
 
    // buttons:
 
diff --git a/data/shatter/Screens/AudDlg.frm b/data/shatter/Screens/AudDlg.frm
index f18b128..5822954 100644
--- a/data/shatter/Screens/AudDlg.frm
+++ b/data/shatter/Screens/AudDlg.frm
@@ -148,8 +148,8 @@ form: {
          x_mins:     ( 20, 100, 100,  20, 100, 100,  20)
          x_weights:  (0.2, 0.3, 0.3, 0.2, 0.3, 0.3, 0.2)
 
-         y_mins:     ( 20,  25,  25,  25,  25,  25,  25,  25,  20)
-         y_weights:  (0.3,   0,   0,   0,   0,   0,   0,   0, 0.7)
+         y_mins:     ( 20,  25,  25,  25,  25,  25,  25,  25,  25,  25,  25,  20)
+         y_weights:  (0.3,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 0.7)
       }
    }
 
@@ -164,11 +164,35 @@ form: {
    },
 
    ctrl: {
+      id:               107
+      pid:              300
+      type:             label
+      text:             "Master Volume:"
+      cells:            (1,1,1,1)
+   },
+
+   ctrl: {
+      id:               108
+      pid:              300
+      type:             label
+      text:             "Music Volume:"
+      cells:            (1,2,1,1)
+   },
+
+   ctrl: {
+      id:               109
+      pid:              300
+      type:             label
+      text:             "World Volume:"
+      cells:            (1,3,1,1)
+   },
+
+   ctrl: {
       id:               101
       pid:              300
       type:             label
       text:             "Effects Volume:"
-      cells:            (1,1,1,1)
+      cells:            (1,4,1,1)
    },
 
    ctrl: {
@@ -176,7 +200,7 @@ form: {
       pid:              300
       type:             label
       text:             "GUI Volume:"
-      cells:            (1,2,1,1)
+      cells:            (1,5,1,1)
    },
 
    ctrl: {
@@ -184,7 +208,7 @@ form: {
       pid:              300
       type:             label
       text:             "Warning Volume:"
-      cells:            (1,3,1,1)
+      cells:            (1,6,1,1)
    },
 
    ctrl: {
@@ -192,7 +216,7 @@ form: {
       pid:              300
       type:             label
       text:             "Vox Volume:"
-      cells:            (1,4,1,1)
+      cells:            (1,7,1,1)
    },
 
    ctrl: {
@@ -200,7 +224,7 @@ form: {
       pid:              300
       type:             label
       text:             "Menu Music:"
-      cells:            (1,6,1,1)
+      cells:            (1,8,1,1)
    },
 
    ctrl: {
@@ -208,7 +232,7 @@ form: {
       pid:              300
       type:             label
       text:             "In Game Music:"
-      cells:            (1,7,1,1)
+      cells:            (1,9,1,1)
    },
 
    defctrl: {
@@ -228,42 +252,42 @@ form: {
       id:               201
       pid:              300
       type:             slider
-      cells:            (2,1,1,1)
+      cells:            (2,4,1,1)
    },
 
    ctrl: {
       id:               202
       pid:              300
       type:             slider
-      cells:            (2,2,1,1)
+      cells:            (2,5,1,1)
    },
 
    ctrl: {
       id:               203
       pid:              300
       type:             slider
-      cells:            (2,3,1,1)
+      cells:            (2,6,1,1)
    },
 
    ctrl: {
       id:               204
       pid:              300
       type:             slider
-      cells:            (2,4,1,1)
+      cells:            (2,7,1,1)
    },
 
    ctrl: {
       id:               205
       pid:              300
       type:             slider
-      cells:            (2,6,1,1)
+      cells:            (2,8,1,1)
    },
 
    ctrl: {
       id:               206
       pid:              300
       type:             slider
-      cells:            (2,7,1,1)
+      cells:            (2,9,1,1)
    },