X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=src%2Fclient%2Fcontrol.c;h=5595cccd45a1cb8aa7b7d18baa384bd46edfd74c;hb=b566b9e2b3689238911283d2bbaffa21c21b1f14;hp=04f0c94825d234edefd67a2488acb41967d2b7c0;hpb=aaa8274f5566c6f1a16bb3c8971f422ff06d0e37;p=plomrogue
diff --git a/src/client/control.c b/src/client/control.c
index 04f0c94..5595ccc 100644
--- a/src/client/control.c
+++ b/src/client/control.c
@@ -1,4 +1,9 @@
-/* src/client/control.c */
+/* src/client/control.c
+ *
+ * This file is part of PlomRogue. PlomRogue is licensed under the GPL version 3
+ * or any later version. For details on its copyright, license, and warranties,
+ * see the file NOTICE in the root directory of the PlomRogue source package.
+ */
#include "control.h"
#include /* uint8_t, uint16_t, uint32_t, UINT32_MAX */
@@ -128,7 +133,7 @@ static uint8_t try_client_commands(struct Command * command)
|| try_1args(command, "cyc_win_b", cycle_active_win, 'b')
|| try_1args(command, "scrl_r", scroll_v_screen, '+')
|| try_1args(command, "scrl_l", scroll_v_screen, '-')
- || try_1args(command, "to_a_keywin", toggle_window, 'k')
+ || try_1args(command, "to_a_keywin", toggle_window, 'a')
|| try_1args(command, "to_g_keywin", toggle_window, '0')
|| try_1args(command, "to_wg_keywin", toggle_window, '1')
|| try_1args(command, "to_wk_keywin", toggle_window, '2')
@@ -179,16 +184,15 @@ static uint8_t set_string_if_char_match(char c, char c_to_match,
static char * build_server_message_with_argument(struct Command * cmd)
{
- char * f_name = "build_server_message_with_argument()";
uint8_t command_size = strlen(cmd->server_msg);
- char * arg_str;
- uint8_t arg_size;
+ char * arg_str = "";
+ uint8_t arg_size = 0;
if ('i' == cmd->arg)
{
arg_size = 3;
- arg_str = try_malloc(arg_size + 1, f_name);
+ arg_str = try_malloc(arg_size + 1, __func__);
int test = sprintf(arg_str, "%d",world.player_inventory_select);
- exit_trouble(test < 0, f_name, "sprintf()");
+ exit_trouble(test < 0, __func__, "sprintf");
}
else if ( set_string_if_char_match(cmd->arg, 'd', &arg_str, "east")
|| set_string_if_char_match(cmd->arg, 'c', &arg_str, "south-east")
@@ -203,9 +207,9 @@ static char * build_server_message_with_argument(struct Command * cmd)
{
exit_err(1, "Illegal server command argument.");
}
- char * msg = try_malloc(command_size + 1 + arg_size + 1, f_name);
+ char * msg = try_malloc(command_size + 1 + arg_size + 1, __func__);
int test = sprintf(msg, "%s %s", cmd->server_msg, arg_str);
- exit_trouble(test < 0, f_name, "sprintf()");
+ exit_trouble(test < 0, __func__, "sprintf");
if ('i' == cmd->arg)
{
free(arg_str);