diff --git a/include/prototypes.h b/include/prototypes.h index c096c808..016bdc6a 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -543,7 +543,7 @@ extern void msl_sel(struct emp_qelem *, coord, coord, natid, int, extern int msl_launch_mindam(struct emp_qelem *, coord, coord, int, int, int, s_char *, int, int); /* mtch.c */ -extern int comtch(register s_char *, struct cmndstr *, int, int); +extern int comtch(register s_char *, struct cmndstr *, int); /* natarg.c */ extern int natarg(s_char *, s_char *); /* neigh.c */ diff --git a/src/lib/player/dispatch.c b/src/lib/player/dispatch.c index 9ade4e48..94108f28 100644 --- a/src/lib/player/dispatch.c +++ b/src/lib/player/dispatch.c @@ -62,8 +62,7 @@ dispatch(char *buf, char *redir) struct cmndstr *command; int cmd; - cmd = comtch(player->argp[0], player_coms, - player->ncomstat, player->god); + cmd = comtch(player->argp[0], player_coms, player->ncomstat); if (cmd < 0) { if (cmd == M_NOTUNIQUE) pr("Command \"%s\" is ambiguous -- ", player->argp[0]); diff --git a/src/lib/player/login.c b/src/lib/player/login.c index a1b94d34..356d7fb6 100644 --- a/src/lib/player/login.c +++ b/src/lib/player/login.c @@ -79,7 +79,7 @@ player_login(void *ud) continue; } ac = parse(buf, player->argp, NULL, space, NULL); - cmd = comtch(player->argp[0], login_coms, 0, 0); + cmd = comtch(player->argp[0], login_coms, 0); if (cmd < 0) { pr_id(player, C_BADCMD, "Command %s not found\n", player->argp[0]); continue; diff --git a/src/lib/subs/mtch.c b/src/lib/subs/mtch.c index 10e3e91b..0b27e0d3 100644 --- a/src/lib/subs/mtch.c +++ b/src/lib/subs/mtch.c @@ -46,8 +46,7 @@ * Ignore commands that require more permissions than COMSTAT. */ int -comtch(register s_char *command, struct cmndstr *coms, int comstat, - int god) +comtch(register s_char *command, struct cmndstr *coms, int comstat) { register struct cmndstr *com; register int status; @@ -56,7 +55,7 @@ comtch(register s_char *command, struct cmndstr *coms, int comstat, return M_IGNORE; status = M_NOTFOUND; for (com = coms; com->c_form != 0; com++) { - if ((com->c_permit & comstat) != com->c_permit && !god) + if ((com->c_permit & comstat) != com->c_permit) continue; switch (mineq(command, com->c_form)) { case ME_MISMATCH: