X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=bdbdfec409a62bf7757d35c65d849c7f5dc01be9;hb=21cac2d976f806643aee1471bcee7b38597ac121;hp=8ab72db11151da6fd2932d5fe6d36bbd50a036b0;hpb=cd9f9c66eb6cba074059e34b39902bb2b864cca6;p=plomrogue diff --git a/src/client/control.c b/src/client/control.c index 8ab72db..bdbdfec 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -3,8 +3,8 @@ #include "control.h" #include /* uint8_t, uint16_t */ #include /* sprintf() */ -#include /* strlen() */ -#include "command_db.h" /* get_command_id(), is_command_id_shortdsc() */ +#include /* strlen(), strcmp() */ +#include "command_db.h" /* get_command_id() */ #include "io.h" /* try_send() */ #include "keybindings.h" /* struct KeyBindingDB, get_command_to_keycode(), * get_keycode_to_command(), mod_selected_keyb(), @@ -23,19 +23,20 @@ -/* If "cmd" matches "match" in get_available_keycode_to_command(), execute "f" - * with provided char arguments and return 1; else only return 0. +/* If "keycode" matches "match" in get_available_keycode_to_command(), execute + * "f" with provided char arguments and return 1; else only return 0. */ -static uint8_t try_cmd_0args(int cmd, char * match, void (* f) ()); -static uint8_t try_cmd_1args(int cmd, char * match, void (* f) (char), char c); -static uint8_t try_cmd_2args(int cmd, char * match, +static uint8_t try_cmd_0args(int keycode, char * match, void (* f) ()); +static uint8_t try_cmd_1args(int keycode, char * match, + void (* f) (char), char c); +static uint8_t try_cmd_2args(int keycode, char * match, void (* f) (char, char), char c1, char c2); -/* If "command_id" is id of command named "match", send (via try_send()) a string - * of "match" + " " + the string representation of "arg" to the server. +/* If "command" matches "match", send (via try_send()) a string of + * "command_message" + " " + the string representation of "arg" to the server. */ -static uint8_t try_player_cmd(int command_id, char * match, char * command_name, - uint8_t arg); +static uint8_t try_player_cmd(char * command, char * match, + char * command_message, uint8_t arg); /* Return keycode to "command" if it is available in current window config. */ static uint16_t get_available_keycode_to_command(char * command); @@ -51,9 +52,9 @@ static void wrap_mv_kb_mod(char c1, char c2); -static uint8_t try_cmd_0args(int cmd, char * match, void (* f) ()) +static uint8_t try_cmd_0args(int keycode, char * match, void (* f) ()) { - if (cmd == get_available_keycode_to_command(match)) + if (keycode == get_available_keycode_to_command(match)) { f(); return 1; @@ -63,9 +64,10 @@ static uint8_t try_cmd_0args(int cmd, char * match, void (* f) ()) -static uint8_t try_cmd_1args(int cmd, char * match, void (* f) (char), char c) +static uint8_t try_cmd_1args(int keycode, char * match, + void (* f) (char), char c) { - if (cmd == get_available_keycode_to_command(match)) + if (keycode == get_available_keycode_to_command(match)) { f(c); return 1; @@ -75,10 +77,10 @@ static uint8_t try_cmd_1args(int cmd, char * match, void (* f) (char), char c) -static uint8_t try_cmd_2args(int cmd, char * match, +static uint8_t try_cmd_2args(int keycode, char * match, void (* f) (char, char), char c1, char c2) { - if (cmd == get_available_keycode_to_command(match)) + if (keycode == get_available_keycode_to_command(match)) { f(c1, c2); return 1; @@ -88,15 +90,15 @@ static uint8_t try_cmd_2args(int cmd, char * match, -static uint8_t try_player_cmd(int command_id, char * match, char * command_name, - uint8_t arg) +static uint8_t try_player_cmd(char * command, char * match, + char * command_message, uint8_t arg) { - if (is_command_id_shortdsc(command_id, match)) + if (!strcmp(command, match)) { - uint8_t command_size = strlen(command_name); + uint8_t command_size = strlen(command_message); uint8_t arg_size = 3; char msg[command_size + 1 + arg_size + 1]; - sprintf(msg, "%s %d", command_name, arg); + sprintf(msg, "%s %d", command_message, arg); try_send(msg); return 1; } @@ -113,7 +115,7 @@ static uint16_t get_available_keycode_to_command(char * command) return keycode; } struct WinConf * wc = get_winconf_by_win(world.wmeta.active); - if (0 == wc->view) + if (0 == wc->view) { keycode = get_keycode_to_command(wc->kb.kbs, command); } @@ -168,26 +170,23 @@ static void wrap_mv_kb_mod(char c1, char c2) extern uint8_t player_control(int key) { - char * command = get_command_to_keycode(world.kb_global.kbs, key); - if (NULL == command && 0 != world.wmeta.active) + char * cmd = get_command_to_keycode(world.kb_global.kbs, key); + if (NULL == cmd && 0 != world.wmeta.active) { struct WinConf * wc = get_winconf_by_win(world.wmeta.active); - command = get_command_to_keycode(wc->kb.kbs, key); + cmd = get_command_to_keycode(wc->kb.kbs, key); } - if (NULL != command) + if (NULL != cmd + && ( try_player_cmd(cmd, "wait", "wait", 0) + || try_player_cmd(cmd, "drop", "drop",world.player_inventory_select) + || try_player_cmd(cmd, "pick", "pick_up", 0) + || try_player_cmd(cmd, "use", "use", world.player_inventory_select) + || try_player_cmd(cmd, "player_u", "move", 'N') + || try_player_cmd(cmd, "player_d", "move", 'S') + || try_player_cmd(cmd, "player_r", "move", 'E') + || try_player_cmd(cmd, "player_l", "move", 'W'))) { - uint8_t id = get_command_id(command); - if ( try_player_cmd(id, "wait", "wait", 0) - || try_player_cmd(id, "drop", "drop", world.player_inventory_select) - || try_player_cmd(id, "pick", "pick_up", 0) - || try_player_cmd(id, "use", "use", world.player_inventory_select) - || try_player_cmd(id, "player_u", "move", 'N') - || try_player_cmd(id, "player_d", "move", 'S') - || try_player_cmd(id, "player_r", "move", 'E') - || try_player_cmd(id, "player_l", "move", 'W')) - { - return 1; - } + return 1; } return 0; }