Refactored cmd_execute

This commit is contained in:
James Booth
2014-04-09 21:38:42 +01:00
parent c3e3759256
commit 26216f6c17

View File

@@ -1251,12 +1251,12 @@ cmd_execute(const char * const command, const char * const inp)
if (cmd != NULL) { if (cmd != NULL) {
gchar **args = cmd->parser(inp, cmd->min_args, cmd->max_args, &result); gchar **args = cmd->parser(inp, cmd->min_args, cmd->max_args, &result);
if ((result == FALSE) && (cmd->setting_func != NULL)) { if (result == FALSE) {
if (cmd->setting_func != NULL) {
cons_show(""); cons_show("");
(*cmd->setting_func)(); (*cmd->setting_func)();
cons_show("Usage: %s", cmd->help.usage); cons_show("Usage: %s", cmd->help.usage);
return TRUE; } else {
} else if (result == FALSE) {
cons_show(""); cons_show("");
cons_show("Usage: %s", cmd->help.usage); cons_show("Usage: %s", cmd->help.usage);
if (ui_current_win_type() == WIN_CHAT) { if (ui_current_win_type() == WIN_CHAT) {
@@ -1264,6 +1264,7 @@ cmd_execute(const char * const command, const char * const inp)
sprintf(usage, "Usage: %s", cmd->help.usage); sprintf(usage, "Usage: %s", cmd->help.usage);
ui_current_print_line(usage); ui_current_print_line(usage);
} }
}
return TRUE; return TRUE;
} else { } else {
gboolean result = cmd->func(args, cmd->help); gboolean result = cmd->func(args, cmd->help);