diff options
| author | Simon Howard | 2009-06-03 23:35:05 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-06-03 23:35:05 +0000 |
| commit | 22a70fe67cad311feb190ad4f52c7f8f2ec4c892 (patch) | |
| tree | f4b05ea93e040aac70b4c68ac8661985bc08d804 | |
| parent | 3c2e7735a0134c5ce6af9624b65b7f3d27c752f1 (diff) | |
| download | chocolate-doom-22a70fe67cad311feb190ad4f52c7f8f2ec4c892.tar.gz chocolate-doom-22a70fe67cad311feb190ad4f52c7f8f2ec4c892.tar.bz2 chocolate-doom-22a70fe67cad311feb190ad4f52c7f8f2ec4c892.zip | |
Use newer keyboard bindings dialog layout from raven-branch.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1549
| -rw-r--r-- | setup/keyboard.c | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/setup/keyboard.c b/setup/keyboard.c index 2e791c7a..de04ac32 100644 --- a/setup/keyboard.c +++ b/setup/keyboard.c @@ -224,37 +224,39 @@ void ConfigKeyboard(void) window = TXT_NewWindow("Keyboard configuration"); - TXT_AddWidgets(window, + TXT_AddWidgets(window, TXT_NewSeparator("Movement"), - movement_table = TXT_NewTable(2), + movement_table = TXT_NewTable(4), TXT_NewSeparator("Action"), - action_table = TXT_NewTable(2), + action_table = TXT_NewTable(4), TXT_NewButton2("Menu keys...", MenuKeysDialog, NULL), + NULL); + TXT_AddWidgets(window, TXT_NewSeparator("Misc."), run_control = TXT_NewCheckBox("Always run", &always_run), TXT_NewInvertedCheckBox("Use native keyboard mapping", &vanilla_keyboard_mapping), NULL); - TXT_SetColumnWidths(movement_table, 20, 8); + TXT_SetColumnWidths(movement_table, 15, 4, 15, 4); TXT_SignalConnect(run_control, "changed", UpdateJoybSpeed, NULL); - AddKeyControl(movement_table, "Move Forward", &key_up); + AddKeyControl(movement_table, "Move Forward", &key_up); + AddKeyControl(movement_table, " Strafe Left", &key_strafeleft); AddKeyControl(movement_table, "Move Backward", &key_down); - AddKeyControl(movement_table, "Turn Left", &key_left); - AddKeyControl(movement_table, "Turn Right", &key_right); - AddKeyControl(movement_table, "Strafe Left", &key_strafeleft); - AddKeyControl(movement_table, "Strafe Right", &key_straferight); - AddKeyControl(movement_table, "Speed On", &key_speed); - AddKeyControl(movement_table, "Strafe On", &key_strafe); + AddKeyControl(movement_table, " Strafe Right", &key_straferight); + AddKeyControl(movement_table, "Turn Left", &key_left); + AddKeyControl(movement_table, " Speed On", &key_speed); + AddKeyControl(movement_table, "Turn Right", &key_right); + AddKeyControl(movement_table, " Strafe On", &key_strafe); - TXT_SetColumnWidths(action_table, 20, 8); + TXT_SetColumnWidths(action_table, 15, 4, 15, 4); - AddKeyControl(action_table, "Use", &key_use); - AddKeyControl(action_table, "Fire", &key_fire); + AddKeyControl(action_table, "Fire/Attack", &key_fire); + AddKeyControl(action_table, " Use", &key_use); TXT_SetWindowAction(window, TXT_HORIZ_CENTER, TestConfigAction()); } |