empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(options_cmd): List options only if none are set.

Browse source 
(list_cmd, login_coms): Login command list is obscure and redundant;
remove.

(login-coms): Improve doc strings.
This commit is contained in:
Markus Armbruster 2005-06-09 22:18:32 +00:00
parent db9098042d
commit 5a8a66746a
1 changed files with 17 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/lib/player/login.c
View file

@ -211,9 +211,9 @@ static int
options_cmd(void) options_cmd(void)
{ {
/* /*
* The login option mechanism allows arbitrary string values, but * The option mechanism allows arbitrary string values, but so far
* so far all options are flags in struct player. Should be easy * all options are flags in struct player. Should be easy to
* to generalize if needed. * generalize if needed.
*/ */
struct logoptstr { struct logoptstr {
char *name; char *name;
@ -227,6 +227,14 @@ options_cmd(void)
int opt; int opt;
unsigned i; unsigned i;
if (!player->argp[1]) {
for (i = 0; i < sizeof(login_opts) / sizeof(*login_opts); ++i)
pr_id(player, C_DATA, "%s=%d",
login_opts[i].name,
(player->flags & login_opts[i].val) != 0);
pr_id(player, C_CMDOK, "\n");
}
for (ap = player->argp+1; *ap; ++ap) { for (ap = player->argp+1; *ap; ++ap) {
p = strchr(*ap, '='); p = strchr(*ap, '=');
if (p) if (p)
@ -244,11 +252,7 @@ options_cmd(void)
player->flags &= ~login_opts[opt].val; player->flags &= ~login_opts[opt].val;
} }
for (i = 0; i < sizeof(login_opts) / sizeof(*login_opts); ++i) pr_id(player, C_CMDOK, "Accepted\n");
pr_id(player, C_DATA, "%s=%d",
login_opts[i].name,
(player->flags & login_opts[i].val) != 0);
pr_id(player, C_CMDOK, "Options okay\n");
return RET_OK; return RET_OK;
} }
@ -326,28 +330,6 @@ kill_cmd(void)
return RET_OK; return RET_OK;
} }
static int
list_cmd(void)
{
struct player *lp;
int first = 1;
if (player->cnum != 0 || !player->validated) {
pr_id(player, C_CMDERR, "Permission denied\n");
return 0;
}
for (lp = player_next(0); lp != 0; lp = player_next(lp)) {
if (first) {
pr_id(player, C_DATA, "user@host\tcountry\tpid\n");
first = 0;
}
pr_id(player, C_DATA, "%s\t%d\n", praddr(lp), lp->cnum);
}
if (first == 0)
pr_id(player, C_DATA, "\n");
return 0;
}
static int static int
quit_cmd(void) quit_cmd(void)
{ {
@ -357,15 +339,14 @@ quit_cmd(void)
} }
struct cmndstr login_coms[] = { struct cmndstr login_coms[] = {
{"client clientname [version info]", 0, client_cmd, 0, 0}, {"client client-id...", 0, client_cmd, 0, 0},
{"coun countryname", 0, coun_cmd, 0, 0}, {"coun country", 0, coun_cmd, 0, 0},
{"kill", 0, kill_cmd, 0, 0}, {"kill", 0, kill_cmd, 0, 0},
{"list", 0, list_cmd, 0, 0}, {"options option=value...", 0, options_cmd, 0, 0},
{"options", 0, options_cmd, 0, 0},
{"pass password", 0, pass_cmd, 0, 0}, {"pass password", 0, pass_cmd, 0, 0},
{"play [user country pass]", 0, play_cmd, 0, 0}, {"play [user [country [password]]]", 0, play_cmd, 0, 0},
{"quit", 0, quit_cmd, 0, 0}, {"quit", 0, quit_cmd, 0, 0},
{"sanc", 0, sanc_cmd, 0, 0}, {"sanc", 0, sanc_cmd, 0, 0},
{"user username", 0, user_cmd, 0, 0}, {"user name", 0, user_cmd, 0, 0},
{0, 0, 0, 0, 0} {0, 0, 0, 0, 0}
}; };