diff options
| author | James Haley | 2010-01-26 00:59:02 +0000 |
|---|---|---|
| committer | James Haley | 2010-01-26 00:59:02 +0000 |
| commit | b80409202d07732ec201c9816887262b505b81d4 (patch) | |
| tree | 364dcb86f2c22411a720447bfa21c4de9191ff6f /src/setup/mainmenu.c | |
| parent | 66e8dc63bd0b384c99f0d0ff60b3d75c42d441b1 (diff) | |
| parent | 8f6edc1f7402215c5e38d1f03939ce6b5ff5e3ae (diff) | |
| download | chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.gz chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.tar.bz2 chocolate-doom-b80409202d07732ec201c9816887262b505b81d4.zip | |
Merge from raven-branch
Subversion-branch: /branches/strife-branch
Subversion-revision: 1825
Diffstat (limited to 'src/setup/mainmenu.c')
| -rw-r--r-- | src/setup/mainmenu.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c index 3b79bc94..46e4b4e6 100644 --- a/src/setup/mainmenu.c +++ b/src/setup/mainmenu.c @@ -19,6 +19,7 @@ // 02111-1307, USA. // +#include <stdio.h> #include <stdlib.h> #include <string.h> @@ -175,6 +176,10 @@ void MainMenu(void) TXT_SetWindowAction(window, TXT_HORIZ_LEFT, quit_action); } +// +// Initialize all configuration variables, load config file, etc +// + static void InitConfig(void) { InitBindings(); @@ -228,7 +233,7 @@ static void SetIcon(void) } // -// Initialise and run the textscreen GUI. +// Initialize and run the textscreen GUI. // static void RunGUI(void) @@ -237,7 +242,7 @@ static void RunGUI(void) if (!TXT_Init()) { - fprintf(stderr, "Failed to initialise GUI\n"); + fprintf(stderr, "Failed to initialize GUI\n"); exit(-1); } |