diff --git a/src/act.comm.c b/src/act.comm.c index 0a8a342..ed92809 100644 --- a/src/act.comm.c +++ b/src/act.comm.c @@ -528,6 +528,7 @@ ACMD(do_gen_comm) } } +/* Currently used for qecho only */ ACMD(do_qcomm) { if (!PRF_FLAGGED(ch, PRF_QUEST)) { @@ -547,18 +548,11 @@ ACMD(do_qcomm) if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_NOREPEAT)) send_to_char(ch, "%s", CONFIG_OK); - else if (subcmd == SCMD_QSAY) { - snprintf(buf, sizeof(buf), "You quest-say, '%s'", argument); - act(buf, FALSE, ch, 0, argument, TO_CHAR); - } else + else act(argument, FALSE, ch, 0, argument, TO_CHAR); - if (subcmd == SCMD_QSAY) - snprintf(buf, sizeof(buf), "$n quest-says, '%s'", argument); - else { - strlcpy(buf, argument, sizeof(buf)); - mudlog(CMP, MAX(LVL_BUILDER, GET_INVIS_LEV(ch)), TRUE, "(GC) %s qechoed: %s", GET_NAME(ch), argument); - } + strlcpy(buf, argument, sizeof(buf)); + mudlog(CMP, MAX(LVL_BUILDER, GET_INVIS_LEV(ch)), TRUE, "(GC) %s qechoed: %s", GET_NAME(ch), argument); for (i = descriptor_list; i; i = i->next) if (STATE(i) == CON_PLAYING && i != ch->desc && PRF_FLAGGED(i->character, PRF_QUEST)) act(buf, 0, ch, 0, i->character, TO_VICT | TO_SLEEP); diff --git a/src/act.h b/src/act.h index 2e33a4a..03df9d0 100644 --- a/src/act.h +++ b/src/act.h @@ -33,8 +33,7 @@ ACMD(do_gen_comm); #define SCMD_GEMOTE 4 /* do_qcomm */ ACMD(do_qcomm); -#define SCMD_QSAY 0 -#define SCMD_QECHO 1 +#define SCMD_QECHO 0 /* do_spec_com */ ACMD(do_spec_comm); #define SCMD_WHISPER 0 diff --git a/src/interpreter.c b/src/interpreter.c index 1dd8337..38fc874 100644 --- a/src/interpreter.c +++ b/src/interpreter.c @@ -247,7 +247,6 @@ cpp_extern const struct command_info cmd_info[] = { { "quest" , "que" , POS_DEAD , do_quest , 0, 0 }, { "qui" , "qui" , POS_DEAD , do_quit , 0, 0 }, { "quit" , "quit" , POS_DEAD , do_quit , 0, SCMD_QUIT }, - { "qsay" , "qsay" , POS_RESTING , do_qcomm , 0, SCMD_QSAY }, { "reply" , "r" , POS_SLEEPING, do_reply , LVL_IMMORT, 0 }, { "rest" , "res" , POS_RESTING , do_rest , 0, 0 },