diff options
| author | Simon Howard | 2010-12-10 23:46:22 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-12-10 23:46:22 +0000 |
| commit | d1a3967194323b08227b20822acedb837e05281a (patch) | |
| tree | 39e4f4da91717159f4f82e6eb37c9fb32d306892 /src/setup/mainmenu.c | |
| parent | 6a2d4763a9080cf88ca9f0b588b8187963eeacf5 (diff) | |
| parent | e225e0c93ce58bb0e33c174847305d39800fd755 (diff) | |
| download | chocolate-doom-d1a3967194323b08227b20822acedb837e05281a.tar.gz chocolate-doom-d1a3967194323b08227b20822acedb837e05281a.tar.bz2 chocolate-doom-d1a3967194323b08227b20822acedb837e05281a.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2214
Diffstat (limited to 'src/setup/mainmenu.c')
| -rw-r--r-- | src/setup/mainmenu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/setup/mainmenu.c b/src/setup/mainmenu.c index c3cb7db5..ffa174de 100644 --- a/src/setup/mainmenu.c +++ b/src/setup/mainmenu.c @@ -189,6 +189,7 @@ void MainMenu(void) { txt_window_t *window; txt_window_action_t *quit_action; + txt_window_action_t *warp_action; window = TXT_NewWindow("Main Menu"); @@ -230,8 +231,12 @@ void MainMenu(void) NULL); quit_action = TXT_NewWindowAction(KEY_ESCAPE, "Quit"); + warp_action = TXT_NewWindowAction(KEY_F1, "Warp"); TXT_SignalConnect(quit_action, "pressed", QuitConfirm, NULL); + TXT_SignalConnect(warp_action, "pressed", + (TxtWidgetSignalFunc) WarpMenu, NULL); TXT_SetWindowAction(window, TXT_HORIZ_LEFT, quit_action); + TXT_SetWindowAction(window, TXT_HORIZ_CENTER, warp_action); TXT_SetKeyListener(window, MainMenuKeyPress, NULL); } |