shithub: choc

Info  •  Files  •  Log  •  Branches

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

--- a/src/setup/multiplayer.c

+++ b/src/setup/multiplayer.c

@@ -860,14 +860,18 @@

     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))

--- a/src/setup/sound.c

+++ b/src/setup/sound.c

@@ -69,6 +69,7 @@

 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;

@@ -255,6 +256,9 @@

     M_BindVariable("snd_sbirq",           &snd_sbirq);

     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)

     {