X-Git-Url: https://plomlompom.com/repos/%22https:/validator.w3.org/static/gitweb.css?a=blobdiff_plain;f=src%2Fclient%2Fcontrol.c;h=7ff99f3e75d39f538c6ede99b63431a178e850a3;hb=d2707c20a501a2c99af20c7e20f7c1a374bfe6aa;hp=02e4fed2360bf8fda263b7b4f54ef0b1eda7733d;hpb=2c5d1a1f12eeb2a742bf46ed8971b3938761c3d5;p=plomrogue diff --git a/src/client/control.c b/src/client/control.c index 02e4fed..7ff99f3 100644 --- a/src/client/control.c +++ b/src/client/control.c @@ -42,7 +42,8 @@ static uint8_t try_client_commands(struct Command * command); /* Try out "command" as one for server messaging; sending is .server_msg, * followed by either a string representing "command"'s .arg, or, if .arg is - * 'i', world.player_inventory_select. Return 1 on success, 0 on failure. + * 'i', world.player_inventory_select, or, if .arg is '0', nothing. Return 1 on + * success, 0 on failure. */ static uint8_t try_server_commands(struct Command * command); @@ -162,17 +163,24 @@ static uint8_t try_server_commands(struct Command * command) if (command->server_msg) { uint8_t arg = (uint8_t) command->arg; - if ('i' == arg) + if ('0' == arg) { - arg = world.player_inventory_select; + send(command->server_msg); + } + else + { + if ('i' == arg) + { + arg = world.player_inventory_select; + } + uint8_t command_size = strlen(command->server_msg); + uint8_t arg_size = 3; + char * msg = try_malloc(command_size + 1 + arg_size + 1, f_name); + int test = sprintf(msg, "%s %d", command->server_msg, arg); + exit_trouble(test < 0, f_name, "sprintf()"); + send(msg); + free(msg); } - uint8_t command_size = strlen(command->server_msg); - uint8_t arg_size = 3; - char * msg = try_malloc(command_size + 1 + arg_size + 1, f_name); - int test = sprintf(msg, "%s %d", command->server_msg, arg); - exit_trouble(test < 0, f_name, "sprintf()"); - send(msg); - free(msg); return 1; } return 0;