commit 47af28e16863f08efd7f8f8ab04b9bcf44846cbd
Merge: 917aa5b1 bd0f3869
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon Apr 1 14:59:34 2013 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon Apr 1 14:59:34 2013 +0000
Merge from trunk.
Subversion-branch: /branches/v2-branch
Subversion-revision: 2577
src/setup/multiplayer.c | 10 +-
textscreen/Makefile.am | 1 +
textscreen/examples/guitest.c | 23 +-
textscreen/textscreen.h | 1 +
textscreen/txt_fileselect.c | 676 ++++++++++++++++++++++++++++++++++++++++++
textscreen/txt_fileselect.h | 88 ++++++
textscreen/txt_inputbox.c | 25 +-
textscreen/txt_widget.h | 1 -
8 files changed, 813 insertions(+), 12 deletions(-)
diff --cc src/setup/multiplayer.c
index e9f18799,d2a38b1b..eac9d550
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@@ -68,15 -76,21 +68,17 @@@ static int found_iwad_selected
static char *iwadfile;
-static char *skills[] =
++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.",
- "Ultra-Violence.",
- "NIGHTMARE!",
+ "I'm too young to die.", "Hey, not too rough.", "Hurt me plenty.",
+ "Ultra-Violence.", "NIGHTMARE!",
};
-static char *chex_skills[] =
+static char *chex_skills[] =
{
- "Easy does it",
- "Not so sticky",
- "Gobs of goo",
- "Extreme ooze",
+ "Easy does it", "Not so sticky", "Gobs of goo", "Extreme ooze",
"SUPER SLIMEY!"
};