diff options
| author | Jakob Fries <jakob.fries@gmail.com> | 2007-08-15 10:25:09 +0000 |
|---|---|---|
| committer | Jakob Fries <jakob.fries@gmail.com> | 2007-08-15 10:25:09 +0000 |
| commit | 4650ff09ad9af22b42cb9f0ba5726355b78cf44d (patch) | |
| tree | 4729ae00ec559ab23cca2b14e3c1c210af8166f3 /src | |
| parent | a49f78b66bc6cc035d4a3a7964e660ccc5ec8127 (diff) | |
| download | zcatch-4650ff09ad9af22b42cb9f0ba5726355b78cf44d.tar.gz zcatch-4650ff09ad9af22b42cb9f0ba5726355b78cf44d.zip | |
dynamic camera option, screenshot button, emoticon button
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/config_variables.h | 2 | ||||
| -rw-r--r-- | src/game/client/menu.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/engine/config_variables.h b/src/engine/config_variables.h index 26fadf71..5af42668 100644 --- a/src/engine/config_variables.h +++ b/src/engine/config_variables.h @@ -21,7 +21,7 @@ MACRO_CONFIG_INT(gfx_texture_compression, 0, 0, 1) MACRO_CONFIG_INT(gfx_high_detail, 1, 0, 1) MACRO_CONFIG_INT(gfx_texture_quality, 1, 0, 1) -MACRO_CONFIG_INT(key_screenshot, 'Q', 32, 512) +MACRO_CONFIG_INT(key_screenshot, 267, 32, 512) MACRO_CONFIG_STR(masterserver, 128, "master.teewars.com") diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp index 86be2421..fe544151 100644 --- a/src/game/client/menu.cpp +++ b/src/game/client/menu.cpp @@ -777,7 +777,7 @@ static int settings_general_render() // Dynamic camera ui_do_label(column1_x, row2_y, "Dynamic Camera:", 36); - config_set_dynamic_camera(&config_copy, ui_do_check_box(&config_copy.dynamic_camera, column2_x, row2_y, 22, 22, config_copy.dynamic_camera)); + config_set_dynamic_camera(&config_copy, ui_do_check_box(&config_copy.dynamic_camera, column2_x + 55, row2_y + 4, 32, 32, config_copy.dynamic_camera)); return 0; } @@ -795,7 +795,7 @@ static int settings_controls_render() { static int scroll_index = 0; - key_thing keys[] = + const key_thing keys[] = { { "Move Left:", &config_copy.key_move_left, config_set_key_move_left }, { "Move Right:", &config_copy.key_move_right, config_set_key_move_right }, @@ -810,6 +810,8 @@ static int settings_controls_render() { "Screenshot:", &config_copy.key_screenshot, config_set_key_screenshot }, }; + const int key_count = sizeof(keys) / sizeof(key_thing); + for (int i = 0; i < 6; i++) { key_thing key = keys[i + scroll_index]; @@ -831,12 +833,11 @@ static int settings_controls_render() config_set_key_hook(&config_copy, ui_do_key_reader(&config_copy.key_hook, column2_x, row1_y + 160, 150, 36, config_copy.key_hook)); */ - scroll_index = do_scroll_bar_vert(&scroll_index, 600, row1_y, 40 * 6, 9 - 7, scroll_index); + scroll_index = do_scroll_bar_vert(&scroll_index, 600, row1_y, 40 * 6, key_count - 6, scroll_index); ui_do_label(column1_x, row1_y + 40 * 6, "Scroll wheel weapon switch", 22); config_set_scroll_weapon(&config_copy, ui_do_check_box(&config_copy.scroll_weapon, column2_x + 50, row1_y + 40 * 6, 22, 22, config_copy.scroll_weapon)); - return 0; } |