summaryrefslogtreecommitdiff
path: root/src/setup/multiplayer.c
diff options
context:
space:
mode:
authorSimon Howard2013-04-01 14:59:34 +0000
committerSimon Howard2013-04-01 14:59:34 +0000
commit47af28e16863f08efd7f8f8ab04b9bcf44846cbd (patch)
tree34a49cc30f9ff65c0e56fc6c2708a2eb17f81ecb /src/setup/multiplayer.c
parent917aa5b184fdfc03a80ce46fb857c3a2780dc705 (diff)
parentbd0f386997cccbeb41103d76f3dc6d9484800f0d (diff)
downloadchocolate-doom-47af28e16863f08efd7f8f8ab04b9bcf44846cbd.tar.gz
chocolate-doom-47af28e16863f08efd7f8f8ab04b9bcf44846cbd.tar.bz2
chocolate-doom-47af28e16863f08efd7f8f8ab04b9bcf44846cbd.zip
Merge from trunk.
Subversion-branch: /branches/v2-branch Subversion-revision: 2577
Diffstat (limited to 'src/setup/multiplayer.c')
-rw-r--r--src/setup/multiplayer.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c
index e9f18799..eac9d550 100644
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -68,6 +68,8 @@ static int found_iwad_selected;
static char *iwadfile;
+static char *wad_extensions[] = { "wad", "lmp", "deh", NULL };
+
static char *doom_skills[] =
{
"I'm too young to die.", "Hey, not too rough.", "Hurt me plenty.",
@@ -163,7 +165,7 @@ static void AddWADs(execute_context_t *exec)
{
int have_wads = 0;
int i;
-
+
for (i=0; i<NUM_WADS; ++i)
{
if (wads[i] != NULL && strlen(wads[i]) > 0)
@@ -277,7 +279,7 @@ static void StartGame(int multiplayer)
AddWADs(exec);
TXT_Shutdown();
-
+
M_SaveDefaults();
PassThroughArguments(exec);
@@ -610,7 +612,9 @@ static void OpenWadsWindow(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))
for (i=0; i<NUM_WADS; ++i)
{
- TXT_AddWidget(window, TXT_NewInputBox(&wads[i], 60));
+ TXT_AddWidget(window,
+ TXT_NewFileSelector(&wads[i], 60, "Select a WAD file",
+ wad_extensions));
}
}