diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-10-04 22:37:35 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-10-04 22:37:35 +0000 |
| commit | b73dcec3975877fd374b55b425c99bb1d6921b53 (patch) | |
| tree | 4463603511162ff4986bccfa37ee8768848a20eb /src/game/client | |
| parent | 10812e621a4cf485a62d76444a6af5dec6cc92f1 (diff) | |
| download | zcatch-b73dcec3975877fd374b55b425c99bb1d6921b53.tar.gz zcatch-b73dcec3975877fd374b55b425c99bb1d6921b53.zip | |
added mousewheel support. added next/prev weapon support
Diffstat (limited to 'src/game/client')
| -rw-r--r-- | src/game/client/game_client.cpp | 15 | ||||
| -rw-r--r-- | src/game/client/menu.cpp | 8 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp index dfb8e698..80a71114 100644 --- a/src/game/client/game_client.cpp +++ b/src/game/client/game_client.cpp @@ -1780,7 +1780,7 @@ void render_game() input.target_x = (int)mouse_pos.x; input.target_y = (int)mouse_pos.y; - input.activeweapon = -1; + input.activeweapon = 0; if(chat_mode != CHATMODE_NONE) input.state = STATE_CHATTING; @@ -1795,13 +1795,14 @@ void render_game() // TODO: this is not very well done. it should check this some other way input.fire = emoticon_selector_active ? 0 : inp_key_pressed(config.key_fire); input.hook = inp_key_pressed(config.key_hook); - - //input.blink = inp_key_pressed('S'); + // Weapon switching - if(inp_key_pressed(config.key_weapon1)) input.activeweapon = 0; - if(inp_key_pressed(config.key_weapon2)) input.activeweapon = 1; - if(inp_key_pressed(config.key_weapon3)) input.activeweapon = 2; - if(inp_key_pressed(config.key_weapon4)) input.activeweapon = 3; + if(inp_key_pressed(config.key_next_weapon)) input.activeweapon = -1; + if(inp_key_pressed(config.key_prev_weapon)) input.activeweapon = -2; + if(inp_key_pressed(config.key_weapon1)) input.activeweapon = 1; + if(inp_key_pressed(config.key_weapon2)) input.activeweapon = 2; + if(inp_key_pressed(config.key_weapon3)) input.activeweapon = 3; + if(inp_key_pressed(config.key_weapon4)) input.activeweapon = 4; } // stress testing diff --git a/src/game/client/menu.cpp b/src/game/client/menu.cpp index e781fcdf..ad418615 100644 --- a/src/game/client/menu.cpp +++ b/src/game/client/menu.cpp @@ -807,10 +807,12 @@ static int settings_controls_render() { "Jump:", &config_copy.key_jump, config_set_key_jump }, { "Fire:", &config_copy.key_fire, config_set_key_fire }, { "Hook:", &config_copy.key_hook, config_set_key_hook }, - { "Pistol:", &config_copy.key_weapon1, config_set_key_weapon1 }, - { "Grenade:", &config_copy.key_weapon2, config_set_key_weapon2 }, + { "Hammer:", &config_copy.key_weapon1, config_set_key_weapon1 }, + { "Pistol:", &config_copy.key_weapon2, config_set_key_weapon2 }, { "Shotgun:", &config_copy.key_weapon3, config_set_key_weapon3 }, - { "Hammer:", &config_copy.key_weapon4, config_set_key_weapon4 }, + { "Grenade:", &config_copy.key_weapon4, config_set_key_weapon4 }, + { "Next Weapon:", &config_copy.key_next_weapon, config_set_key_next_weapon }, + { "Prev. Weapon:", &config_copy.key_prev_weapon, config_set_key_prev_weapon }, { "Emoticon:", &config_copy.key_emoticon, config_set_key_emoticon }, { "Screenshot:", &config_copy.key_screenshot, config_set_key_screenshot }, }; |