From a7ffa85498b6524760ab4ba15fc2d01d44a279ad Mon Sep 17 00:00:00 2001 From: Rumble Date: Sat, 10 May 2008 19:16:35 +0000 Subject: [PATCH] Fixed another typo, added a check for !NPC do_gen_comm, and changed do_return to only run autowiz if level changes. --Rumble --- src/act.comm.c | 2 +- src/act.wizard.c | 5 ++++- src/dg_scripts.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/act.comm.c b/src/act.comm.c index 443c903..f6cdf34 100644 --- a/src/act.comm.c +++ b/src/act.comm.c @@ -456,7 +456,7 @@ ACMD(do_gen_comm) return; } /* Make sure the char is on the channel. */ - if (PRF_FLAGGED(ch, channels[subcmd])) { + if (!IS_NPC(ch) && PRF_FLAGGED(ch, channels[subcmd])) { send_to_char(ch, "%s", com_msgs[subcmd][2]); return; } diff --git a/src/act.wizard.c b/src/act.wizard.c index 0da2006..e059b9a 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -1225,8 +1225,11 @@ void do_cheat(struct char_data *ch) ACMD(do_return) { if (!IS_NPC(ch) && !ch->desc->original) { + int level, newlevel; + level = GET_LEVEL(ch); do_cheat(ch); - if (!PLR_FLAGGED(ch, PLR_NOWIZLIST)) + newlevel = GET_LEVEL(ch); + if (!PLR_FLAGGED(ch, PLR_NOWIZLIST)&& level != newlevel) run_autowiz(); } diff --git a/src/dg_scripts.c b/src/dg_scripts.c index df35fea..0655261 100644 --- a/src/dg_scripts.c +++ b/src/dg_scripts.c @@ -1214,7 +1214,7 @@ ACMD(do_detach) } } - if (arg3 == NULL || *arg3) + if (arg3 == NULL || !*arg3) send_to_char(ch, "You must specify a trigger to remove.\r\n"); else trigger = arg3;