commit 9db0c9c6444dcb2aa4541466caf6b184030683ca
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Feb 2 21:31:40 2012 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Feb 2 21:31:40 2012 +0000

    Bind missing sound variables so the settings are not lost when running
    the setup tool (thanks Alexandre Xavier).

    Subversion-branch: /branches/v2-branch
    Subversion-revision: 2485
---
 src/setup/multiplayer.c | 6 +++++-
 src/setup/sound.c       | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c
index d9bda1fe..3d7c0e3b 100644
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -860,15 +860,19 @@ static void QueryResponseCallback(net_addr_t *addr,
     strncpy(description, querydata->description, 46);
     description[46] = '\0';

+while (query_servers_found < 12) {
+char buf[100];
+sprintf(buf, "server %i", query_servers_found);
     TXT_AddWidgets(results_table,
                    TXT_NewLabel(ping_time_str),
                    TXT_NewButton2(NET_AddrToString(addr),
                                   SelectQueryAddress, querydata),
-                   TXT_NewLabel(description),
+                   TXT_NewLabel(buf),//description),
                    NULL);

     ++query_servers_found;
 }
+}

 static void QueryPeriodicCallback(TXT_UNCAST_ARG(results_table))
 {
diff --git a/src/setup/sound.c b/src/setup/sound.c
index f6a9e551..1ed73cc6 100644
--- a/src/setup/sound.c
+++ b/src/setup/sound.c
@@ -69,6 +69,7 @@ int snd_sfxdevice = SNDDEVICE_SB;
 int snd_musicdevice = SNDDEVICE_GENMIDI;
 int snd_samplerate = 44100;
 int opl_io_port = 0x388;
+int snd_cachesize = 64 * 1024 * 1024;

 static int numChannels = 8;
 static int sfxVolume = 15;
@@ -256,6 +257,9 @@ void BindSoundVariables(void)
     M_BindVariable("snd_sbdma",           &snd_sbdma);
     M_BindVariable("snd_mport",           &snd_mport);

+    M_BindVariable("snd_cachesize",       &snd_cachesize);
+    M_BindVariable("opl_io_port",         &opl_io_port);
+
     if (gamemission == strife)
     {
         M_BindVariable("voice_volume",    &voiceVolume);