commit 4b2dc259269602670c436a25e335608f269ad866
Author:     Simon Howard <fraggle@soulsphere.org>
AuthorDate: Thu Jul 16 00:04:42 2015 -0400
Commit:     Simon Howard <fraggle@soulsphere.org>
CommitDate: Thu Jul 16 00:04:42 2015 -0400

    setup: Update to add new defaults.

    A couple more 'alternate default' settings that I think are worth
    adding.
---
 src/setup/display.h  | 1 +
 src/setup/mainmenu.c | 2 ++
 src/setup/sound.c    | 2 +-
 src/setup/sound.h    | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/setup/display.h b/src/setup/display.h
index 2d7e63ec..341ccd8f 100644
--- a/src/setup/display.h
+++ b/src/setup/display.h
@@ -21,5 +21,6 @@ void BindDisplayVariables(void);

 extern int show_endoom;
 extern int graphical_startup;
+extern int png_screenshots;

 #endif /* #ifndef SETUP_DISPLAY_H */
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c
index e35decd5..8c1a26a3 100644
--- a/src/setup/mainmenu.c
+++ b/src/setup/mainmenu.c
@@ -91,6 +91,8 @@ static void SensibleDefaults(void)
     show_endoom = 0;
     dclick_use = 0;
     novert = 1;
+    snd_dmxoption = "-opl3";
+    png_screenshots = 1;
 }

 static int MainMenuKeyPress(txt_window_t *window, int key, void *user_data)
diff --git a/src/setup/sound.c b/src/setup/sound.c
index 9f1da402..7001907c 100644
--- a/src/setup/sound.c
+++ b/src/setup/sound.c
@@ -86,6 +86,7 @@ int snd_cachesize = 64 * 1024 * 1024;
 int snd_maxslicetime_ms = 28;
 char *snd_musiccmd = "";
 int snd_pitchshift = 0;
+char *snd_dmxoption = "";

 static int numChannels = 8;
 static int sfxVolume = 8;
@@ -95,7 +96,6 @@ static int show_talk = 0;
 static int use_libsamplerate = 0;
 static float libsamplerate_scale = 0.65;

-static char *snd_dmxoption = "";
 static char *timidity_cfg_path = NULL;
 static char *gus_patch_path = NULL;
 static int gus_ram_kb = 1024;
diff --git a/src/setup/sound.h b/src/setup/sound.h
index c4a8ac60..a907f36c 100644
--- a/src/setup/sound.h
+++ b/src/setup/sound.h
@@ -20,4 +20,6 @@
 void ConfigSound(void);
 void BindSoundVariables(void);

+extern char *snd_dmxoption;
+
 #endif /* #ifndef SETUP_SOUND_H */