edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

you can now choose what key activates which weapon

Browse source
This commit is contained in:
Jakob Fries 2007-07-24 23:19:45 +00:00
parent 5bd2c434f6
commit 33f1f2f835
3 changed files with 47 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/client/game_client.cpp
View file

@ -1174,8 +1174,13 @@ void modc_render()
input.blink = inp_key_pressed('S'); input.blink = inp_key_pressed('S');
// Weapon switching // Weapon switching
for(int i = 0; i < 8; i++) #define TEST_WEAPON_KEY(key) if (inp_key_pressed(config.key_weapon ## key)) input.activeweapon = key-1;
input.activeweapon = inp_key_pressed('1'+i) ? i : input.activeweapon; TEST_WEAPON_KEY(1);
TEST_WEAPON_KEY(2);
TEST_WEAPON_KEY(3);
TEST_WEAPON_KEY(4);
//for(int i = 0; i < 8; i++)
// input.activeweapon = inp_key_pressed('1'+i) ? i : input.activeweapon;
} }
snap_input(&input, sizeof(input)); snap_input(&input, sizeof(input));

37
src/game/client/menu.cpp
View file

@ -766,9 +766,41 @@ static int settings_general_render()
return 0; return 0;
} }
typedef void (*assign_func_callback)(configuration *config, int value);
struct key_thing
{
char name[32];
int *key;
assign_func_callback assign_func;
};
static int settings_controls_render() static int settings_controls_render()
{ {
static int scroll_index = 0;
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 },
{ "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 },
{ "Shotgun:", &config_copy.key_weapon3, config_set_key_weapon3 },
{ "Hammer:", &config_copy.key_weapon4, config_set_key_weapon4 },
};
for (int i = 0; i < 7; i++)
{
key_thing key = keys[i + scroll_index];
ui_do_label(column1_x, row1_y + 40 * i, key.name, 36);
key.assign_func(&config_copy, ui_do_key_reader(key.key, column2_x, row1_y + 40 * i, 150, 36, *key.key));
}
// KEYS // KEYS
/*
ui_do_label(column1_x, row1_y + 0, "Move Left:", 36); ui_do_label(column1_x, row1_y + 0, "Move Left:", 36);
config_set_key_move_left(&config_copy, ui_do_key_reader(&config_copy.key_move_left, column2_x, row1_y + 0, 150, 36, config_copy.key_move_left)); config_set_key_move_left(&config_copy, ui_do_key_reader(&config_copy.key_move_left, column2_x, row1_y + 0, 150, 36, config_copy.key_move_left));
ui_do_label(column1_x, row1_y + 40, "Move Right:", 36); ui_do_label(column1_x, row1_y + 40, "Move Right:", 36);
@ -779,11 +811,14 @@ static int settings_controls_render()
config_set_key_fire(&config_copy, ui_do_key_reader(&config_copy.key_fire, column2_x, row1_y + 120, 150, 36, config_copy.key_fire)); config_set_key_fire(&config_copy, ui_do_key_reader(&config_copy.key_fire, column2_x, row1_y + 120, 150, 36, config_copy.key_fire));
ui_do_label(column1_x, row1_y + 160, "Hook:", 36); ui_do_label(column1_x, row1_y + 160, "Hook:", 36);
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)); 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 * 7, 9 - 7, scroll_index);
return 0; return 0;
} }
static const unsigned MAX_RESOLUTIONS = 8; static const int MAX_RESOLUTIONS = 8;
static int settings_video_render() static int settings_video_render()
{ {

4
src/game/game_variables.h
View file

@ -3,6 +3,10 @@ MACRO_CONFIG_INT(key_move_right, 68, 32, 512)
MACRO_CONFIG_INT(key_jump, 32, 32, 512) MACRO_CONFIG_INT(key_jump, 32, 32, 512)
MACRO_CONFIG_INT(key_fire, 384, 32, 512) MACRO_CONFIG_INT(key_fire, 384, 32, 512)
MACRO_CONFIG_INT(key_hook, 385, 32, 512) MACRO_CONFIG_INT(key_hook, 385, 32, 512)
MACRO_CONFIG_INT(key_weapon1, 49, 32, 512)
MACRO_CONFIG_INT(key_weapon2, 50, 32, 512)
MACRO_CONFIG_INT(key_weapon3, 51, 32, 512)
MACRO_CONFIG_INT(key_weapon4, 52, 32, 512)
MACRO_CONFIG_INT(scorelimit, 20, 0, 1000) MACRO_CONFIG_INT(scorelimit, 20, 0, 1000)
MACRO_CONFIG_INT(timelimit, 0, 0, 1000) MACRO_CONFIG_INT(timelimit, 0, 0, 1000)