diff options
Diffstat (limited to 'src/doom')
| -rw-r--r-- | src/doom/am_map.c | 14 | ||||
| -rw-r--r-- | src/doom/d_main.c | 4 | ||||
| -rw-r--r-- | src/doom/g_game.c | 9 | ||||
| -rw-r--r-- | src/doom/m_menu.c | 30 |
4 files changed, 6 insertions, 51 deletions
diff --git a/src/doom/am_map.c b/src/doom/am_map.c index 37ccf5b3..89a5dffc 100644 --- a/src/doom/am_map.c +++ b/src/doom/am_map.c @@ -37,6 +37,7 @@ #include "w_wad.h" #include "m_cheat.h" +#include "m_controls.h" #include "i_system.h" // Needs access to LFB. @@ -90,19 +91,6 @@ // drawing stuff -int key_map_north = KEY_UPARROW; -int key_map_south = KEY_DOWNARROW; -int key_map_east = KEY_RIGHTARROW; -int key_map_west = KEY_LEFTARROW; -int key_map_zoomin = '='; -int key_map_zoomout = '-'; -int key_map_toggle = KEY_TAB; -int key_map_maxzoom = '0'; -int key_map_follow = 'f'; -int key_map_grid = 'g'; -int key_map_mark = 'm'; -int key_map_clearmark = 'c'; - #define AM_NUMMARKPOINTS 10 // scale on entry diff --git a/src/doom/d_main.c b/src/doom/d_main.c index ce8f6ec8..ce9b667d 100644 --- a/src/doom/d_main.c +++ b/src/doom/d_main.c @@ -353,6 +353,10 @@ void D_BindVariables(void) I_BindSoundVariables(); M_BindBaseControls(); + M_BindWeaponControls(); + M_BindMapControls(); + M_BindMenuControls(); + #ifdef FEATURE_MULTIPLAYER NET_BindVariables(); #endif diff --git a/src/doom/g_game.c b/src/doom/g_game.c index a2b08739..5d49c5b4 100644 --- a/src/doom/g_game.c +++ b/src/doom/g_game.c @@ -157,15 +157,6 @@ wbstartstruct_t wminfo; // parms for world map / intermission byte consistancy[MAXPLAYERS][BACKUPTICS]; -int key_weapon1 = '1'; -int key_weapon2 = '2'; -int key_weapon3 = '3'; -int key_weapon4 = '4'; -int key_weapon5 = '5'; -int key_weapon6 = '6'; -int key_weapon7 = '7'; -int key_weapon8 = '8'; - #define MAXPLMOVE (forwardmove[1]) #define TURBOTHRESHOLD 0x32 diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c index af3d1ae2..a0d66dd4 100644 --- a/src/doom/m_menu.c +++ b/src/doom/m_menu.c @@ -53,6 +53,7 @@ #include "g_game.h" #include "m_argv.h" +#include "m_controls.h" #include "p_saveg.h" #include "s_sound.h" @@ -73,35 +74,6 @@ extern boolean message_dontfuckwithme; extern boolean chat_on; // in heads-up code // -// menu keys: -// - -int key_menu_activate = KEY_ESCAPE; -int key_menu_up = KEY_UPARROW; -int key_menu_down = KEY_DOWNARROW; -int key_menu_left = KEY_LEFTARROW; -int key_menu_right = KEY_RIGHTARROW; -int key_menu_back = KEY_BACKSPACE; -int key_menu_forward = KEY_ENTER; -int key_menu_confirm = 'y'; -int key_menu_abort = 'n'; - -int key_menu_help = KEY_F1; -int key_menu_save = KEY_F2; -int key_menu_load = KEY_F3; -int key_menu_volume = KEY_F4; -int key_menu_detail = KEY_F5; -int key_menu_qsave = KEY_F6; -int key_menu_endgame = KEY_F7; -int key_menu_messages = KEY_F8; -int key_menu_qload = KEY_F9; -int key_menu_quit = KEY_F10; -int key_menu_gamma = KEY_F11; - -int key_menu_incscreen = KEY_EQUALS; -int key_menu_decscreen = KEY_MINUS; - -// // defaulted values // int mouseSensitivity = 5; |