diff --git a/src/act.comm.c b/src/act.comm.c index c150a49..7b8e62e 100644 --- a/src/act.comm.c +++ b/src/act.comm.c @@ -217,7 +217,7 @@ ACMD(do_reply) tch = tch->next; if (!tch) - send_to_char(ch, "They are no longer playing.\r\n"); + send_to_char(ch, "That player is no longer here.\r\n"); else if (is_tell_ok(ch, tch)) { if (CONFIG_SPECIAL_IN_COMM && legal_communication(argument)) parse_at(argument); diff --git a/src/act.informative.c b/src/act.informative.c index db472b1..3040d81 100644 --- a/src/act.informative.c +++ b/src/act.informative.c @@ -2411,7 +2411,7 @@ ACMD(do_whois) hours = (time(0) - victim->player.time.logon) / 3600; if (!got_from_file) { - send_to_char(ch, "Last Logon: They're playing now! (Idle %d Minutes)", + send_to_char(ch, "Last Logon: Playing now! (Idle %d Minutes)", victim->char_specials.timer * SECS_PER_MUD_HOUR / SECS_PER_REAL_MIN); if (!victim->desc) @@ -2420,7 +2420,7 @@ ACMD(do_whois) send_to_char(ch, "\r\n"); if (PRF_FLAGGED(victim, PRF_AFK)) - send_to_char(ch, "%s%s is afk right now, so %s may not respond to communication.%s\r\n", CBGRN(ch, C_NRM), GET_NAME(victim), GET_SEX(victim) == SEX_NEUTRAL ? "it" : (GET_SEX(victim) == SEX_MALE ? "he" : "she"), CCNRM(ch, C_NRM)); + send_to_char(ch, "%s%s is afk right now, so %s may not respond to communication.%s\r\n", CBGRN(ch, C_NRM), GET_NAME(victim), HSSH(victim), CCNRM(ch, C_NRM)); } else if (hours > 0) send_to_char(ch, "Last Logon: %s (%d days & %d hours ago.)\r\n", buf, hours/24, hours%24); @@ -2430,9 +2430,9 @@ ACMD(do_whois) } if (has_mail(GET_IDNUM(victim))) - send_to_char (ch, "They have mail waiting.\r\n"); + act("$E$u has mail waiting.", FALSE, ch, 0, victim, TO_CHAR); else - send_to_char (ch, "They have no mail waiting.\r\n"); + act("$E$u has no mail waiting.", FALSE, ch, 0, victim, TO_CHAR); if (PLR_FLAGGED(victim, PLR_DELETED)) send_to_char (ch, "***DELETED***\r\n"); diff --git a/src/act.offensive.c b/src/act.offensive.c index 769340c..4ad4b61 100644 --- a/src/act.offensive.c +++ b/src/act.offensive.c @@ -75,7 +75,7 @@ ACMD(do_hit) if (!*arg) send_to_char(ch, "Hit who?\r\n"); else if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM))) - send_to_char(ch, "They don't seem to be here.\r\n"); + send_to_char(ch, "That player is not here.\r\n"); else if (vict == ch) { send_to_char(ch, "You hit yourself...OUCH!.\r\n"); act("$n hits $mself, and says OUCH!", FALSE, ch, 0, vict, TO_ROOM); @@ -110,7 +110,7 @@ ACMD(do_kill) send_to_char(ch, "Kill who?\r\n"); } else { if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM))) - send_to_char(ch, "They aren't here.\r\n"); + send_to_char(ch, "That player is not here.\r\n"); else if (ch == vict) send_to_char(ch, "Your mother would be so sad.. :(\r\n"); else { diff --git a/src/act.other.c b/src/act.other.c index a579ac0..8b3580a 100644 --- a/src/act.other.c +++ b/src/act.other.c @@ -403,7 +403,7 @@ ACMD(do_group) send_to_char(ch, "But you are already part of a group.\r\n"); return; } else if (!GROUP(vict)) { - send_to_char(ch, "They are not a part of a group!\r\n"); + act("$E$u is not a part of a group!", FALSE, ch, 0, vict, TO_CHAR); return; } else if (!IS_SET(GROUP_FLAGS(GROUP(vict)), GROUP_OPEN)) { send_to_char(ch, "That group isn't accepting members.\r\n"); @@ -425,7 +425,7 @@ ACMD(do_group) send_to_char(ch, "Only the group's leader can kick members out.\r\n"); return; } else if (GROUP(vict) != GROUP(ch)) { - send_to_char(ch, "They are not a member of your group!\r\n"); + act("$E$u is not a member of your group!", FALSE, ch, 0, vict, TO_CHAR); return; } send_to_char(ch, "You have kicked %s out of the group.\r\n", GET_NAME(vict)); diff --git a/src/act.wizard.c b/src/act.wizard.c index 90cd8a0..a7346d2 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -1490,7 +1490,7 @@ ACMD(do_advance) return; } if (newlevel == GET_LEVEL(victim)) { - send_to_char(ch, "They are already at that level.\r\n"); + act("$E is already at that level.", FALSE, ch, 0, victim, TO_CHAR); return; } oldlevel = GET_LEVEL(victim); @@ -1574,7 +1574,7 @@ ACMD(do_restore) else if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_WORLD))) send_to_char(ch, "%s", CONFIG_NOPERSON); else if (!IS_NPC(vict) && ch != vict && GET_LEVEL(vict) >= GET_LEVEL(ch)) - send_to_char(ch, "They don't need your help.\r\n"); + act("$E doesn't need your help.", FALSE, ch, 0, vict, TO_CHAR); else { GET_HIT(vict) = GET_MAX_HIT(vict); GET_MANA(vict) = GET_MAX_MANA(vict); @@ -1719,7 +1719,7 @@ ACMD(do_dc) * get disconnected by two different immortals in the same 1/10th of a * second, we have the below 'if' check. -gg */ if (STATE(d) == CON_DISCONNECT || STATE(d) == CON_CLOSE) - send_to_char(ch, "They're already being disconnected.\r\n"); + act("$E's already being disconnected.", FALSE, ch, 0, d->character, TO_CHAR); else { /* Remember that we can disconnect people not in the game and that rather * confuses the code when it expected there to be a character context. */ diff --git a/src/objsave.c b/src/objsave.c index db700ec..bfa99b0 100644 --- a/src/objsave.c +++ b/src/objsave.c @@ -1265,8 +1265,8 @@ static int Crash_load_objs(struct char_data *ch) { } /* Little hoarding check. -gg 3/1/98 */ - mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s (level %d) has %d %s (max %d).", - GET_NAME(ch), GET_LEVEL(ch), num_objs, num_objs > 1 ? "objects" : "object", CONFIG_MAX_OBJ_SAVE); + mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s (level %d) has %d object%s (max %d).", + GET_NAME(ch), GET_LEVEL(ch), num_objs, num_objs != 1 ? "s" : "", CONFIG_MAX_OBJ_SAVE); fclose(fl); diff --git a/src/prefedit.c b/src/prefedit.c index 64cb894..6a086cf 100755 --- a/src/prefedit.c +++ b/src/prefedit.c @@ -895,6 +895,7 @@ ACMD(do_oasis_prefedit) struct descriptor_data *d; struct char_data *vict; char *buf3; + char buf[MAX_STRING_LENGTH]; char buf1[MAX_STRING_LENGTH]; char buf2[MAX_STRING_LENGTH]; @@ -939,7 +940,8 @@ ACMD(do_oasis_prefedit) if (ch == vict) send_to_char(ch, "Your preferences are currently being edited by %s.\r\n", PERS(d->character, ch)); else - send_to_char(ch, "Their preferences are currently being edited by %s.\r\n", PERS(d->character, ch)); + sprintf(buf, "$S$u preferences are currently being edited by %s.", PERS(d->character, ch)); + act(buf, FALSE, ch, 0, vict, TO_CHAR); return; } } diff --git a/src/spells.c b/src/spells.c index d55ab94..1861408 100644 --- a/src/spells.c +++ b/src/spells.c @@ -131,10 +131,9 @@ ASPELL(spell_summon) if (!IS_NPC(victim) && !PRF_FLAGGED(victim, PRF_SUMMONABLE) && !PLR_FLAGGED(victim, PLR_KILLER)) { send_to_char(victim, "%s just tried to summon you to: %s.\r\n" - "%s failed because you have summon protection on.\r\n" + "This failed because you have summon protection on.\r\n" "Type NOSUMMON to allow other players to summon you.\r\n", - GET_NAME(ch), world[IN_ROOM(ch)].name, - (ch->player.sex == SEX_MALE) ? "He" : "She"); + GET_NAME(ch), world[IN_ROOM(ch)].name); send_to_char(ch, "You failed because %s has summon protection on.\r\n", GET_NAME(victim)); mudlog(BRF, LVL_IMMORT, TRUE, "%s failed summoning %s to %s.", GET_NAME(ch), GET_NAME(victim), world[IN_ROOM(ch)].name);