Skip to content

refactor: replaced multiple instances of send_to_char #198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rhoxie21 wants to merge 6 commits into
base: unstable
Choose a base branch
from
Open

refactor: replaced multiple instances of send_to_char #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bdc404e
refactor: replace send_to_char
rhoxie21 Mar 28, 2020
73ed0b4
refactor: fix additional send_to_char
rhoxie21 Mar 29, 2020
6f34129
refactor: more replace send_to
rhoxie21 Mar 29, 2020
d5099e8
Revert "refactor: fix additional send_to_char"
rhoxie21 Apr 5, 2020
e3fad46
Revert "refactor: more replace send_to"
rhoxie21 Apr 5, 2020
ff088a8
fix: additional safe changes for send_to_char
rhoxie21 Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions src/act_board.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ void do_nread_next (CHAR_T *ch, char *argument, time_t *last_note) {
}
}

send_to_char ("No new notes in this board.\n\r", ch);
printf_to_char (ch, "No new notes in this board.\n\r");
if (char_change_to_next_board (ch))
sprintf (buf, "Changed to next board, %s.\n\r", ch->pcdata->board->name);
else
Expand Down Expand Up @@ -100,8 +100,8 @@ DEFINE_DO_FUN (do_nwrite) {

/* continue previous note, if any text was written*/
if (ch->pcdata->in_progress && (!ch->pcdata->in_progress->text)) {
send_to_char ("Note in progress cancelled because you did not manage to write any text \n\r"
"before losing link.\n\r\n\r", ch);
printf_to_char (ch, "Note in progress cancelled because you did not manage to write any text \n\r"
"before losing link.\n\r\n\r");
note_free (ch->pcdata->in_progress);
ch->pcdata->in_progress = NULL;
}
Expand Down Expand Up @@ -143,7 +143,7 @@ DEFINE_DO_FUN (do_nwrite) {
}

send_to_char (buf, ch);
send_to_char ("\n\r{YTo{x: ", ch);
printf_to_char (ch, "\n\r{YTo{x: ");

ch->desc->connected = CON_NOTE_TO;
/* nanny takes over from here */
Expand All @@ -155,11 +155,11 @@ DEFINE_DO_FUN (do_nwrite) {
ch->pcdata->in_progress->to_list,
ctime_fixed (&ch->pcdata->in_progress->expire),
ch->pcdata->in_progress->subject);
send_to_char ("{GYour note so far:{x\n\r", ch);
printf_to_char (ch, "{GYour note so far:{x\n\r");
send_to_char (ch->pcdata->in_progress->text, ch);

send_to_char ("\n\rEnter text. Type {W~{x or {WEND{x on an empty line to end note.\n\r"
"=======================================================\n\r", ch);
printf_to_char (ch, "\n\rEnter text. Type {W~{x or {WEND{x on an empty line to end note.\n\r"
"=======================================================\n\r");

ch->desc->connected = CON_NOTE_TEXT;
}
Expand Down Expand Up @@ -195,7 +195,7 @@ DEFINE_DO_FUN (do_nremove) {

note_unlink (p, ch->pcdata->board);
note_free (p);
send_to_char ("Note removed!\n\r", ch);
printf_to_char (ch, "Note removed!\n\r");
board_save (ch->pcdata->board);
}

Expand All @@ -215,8 +215,8 @@ DEFINE_DO_FUN (do_nlist) {
count++;
}

send_to_char ("{WNotes on this board:{x\n\r"
"{rNum> Author Subject{x\n\r", ch);
printf_to_char (ch, "{WNotes on this board:{x\n\r"
"{rNum> Author Subject{x\n\r");

last_note = ch->pcdata->last_note[board_number (ch->pcdata->board)];
for (p = ch->pcdata->board->note_first; p; p = p->board_next) {
Expand All @@ -243,7 +243,7 @@ DEFINE_DO_FUN (do_ncatchup) {
"Alas, there are no notes in that board.\n\r", ch);

ch->pcdata->last_note[board_number(ch->pcdata->board)] = p->date_stamp;
send_to_char ("All mesages skipped.\n\r", ch);
printf_to_char (ch, "All mesages skipped.\n\r");
}

/* Show all accessible boards with their numbers of unread messages OR
Expand All @@ -259,8 +259,8 @@ DEFINE_DO_FUN (do_board) {
int unread;

count = 1;
send_to_char ("{RNum Name Unread Description{x\n\r"
"{R==== ============ ====== ============================={x\n\r", ch);
printf_to_char (ch, "{RNum Name Unread Description{x\n\r"
"{R==== ============ ====== ============================={x\n\r");
for (i = 0; i < BOARD_MAX; i++) {
unread = board_get_unread_notes_for_char (&board_table[i], ch);
if (unread != BOARD_NOACCESS) {
Expand All @@ -276,11 +276,11 @@ DEFINE_DO_FUN (do_board) {

/* Inform of rights */
if (ch->pcdata->board->read_level > char_get_trust(ch))
send_to_char ("You cannot read nor write notes on this board.\n\r", ch);
printf_to_char (ch, "You cannot read nor write notes on this board.\n\r");
else if (ch->pcdata->board->write_level > char_get_trust(ch))
send_to_char ("You can only read notes from this board.\n\r", ch);
printf_to_char (ch, "You can only read notes from this board.\n\r");
else
send_to_char ("You can both read and write on this board.\n\r", ch);
printf_to_char (ch, "You can both read and write on this board.\n\r");
return;
}

Expand All @@ -305,7 +305,7 @@ DEFINE_DO_FUN (do_board) {
: "You can both read and write here");
}
else
send_to_char ("No such board.\n\r", ch);
printf_to_char (ch, "No such board.\n\r");
return;
}

Expand Down Expand Up @@ -345,9 +345,9 @@ DEFINE_DO_FUN (do_note) {
else if (!str_cmp (arg, "remove"))
do_nremove (ch, argument);
else if (!str_cmp (arg, "purge"))
send_to_char ("Obsolete.\n\r", ch);
printf_to_char (ch, "Obsolete.\n\r");
else if (!str_cmp (arg, "archive"))
send_to_char ("Obsolete.\n\r", ch);
printf_to_char (ch, "Obsolete.\n\r");
else if (!str_cmp (arg, "catchup"))
do_ncatchup (ch, argument);
else
Expand Down
26 changes: 13 additions & 13 deletions src/act_comm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,17 +198,17 @@ DEFINE_DO_FUN (do_socials) {
for (soc = social_get_first(); soc != NULL; soc = social_get_next (soc)) {
printf_to_char (ch, "%-12s", soc->name);
if (++col % 6 == 0)
send_to_char ("\n\r", ch);
printf_to_char (ch, "\n\r");
}
if (col % 6 != 0)
send_to_char ("\n\r", ch);
printf_to_char (ch, "\n\r");
}

/* RT code to display channel status */
DEFINE_DO_FUN (do_channels) {
/* lists all channels and their status */
send_to_char (" Channel Status\n\r", ch);
send_to_char ("---------------------------\n\r", ch);
printf_to_char (ch, " Channel Status\n\r");
printf_to_char (ch, "---------------------------\n\r");

do_autolist_flag ("{dgossip{x", ch, ~ch->comm, COMM_NOGOSSIP);
do_autolist_flag ("{aauction{x", ch, ~ch->comm, COMM_NOAUCTION);
Expand All @@ -221,31 +221,31 @@ DEFINE_DO_FUN (do_channels) {
if (IS_IMMORTAL (ch))
do_autolist_flag ("{igod channel{x", ch, ~ch->comm, COMM_NOWIZ);

send_to_char ("---------------------------\n\r", ch);
printf_to_char (ch, "---------------------------\n\r");
do_autolist_flag ("{tquiet mode{x", ch, ch->comm, COMM_QUIET);
do_autolist_flag ("AFK", ch, ch->comm, COMM_AFK);

send_to_char ("---------------------------\n\r", ch);
printf_to_char (ch, "---------------------------\n\r");
if (ch->lines != PAGELEN) {
if (ch->lines) {
printf_to_char (ch, "You display %d lines of scroll.\n\r",
ch->lines + 2);
}
else
send_to_char ("Scroll buffering is off.\n\r", ch);
printf_to_char (ch, "Scroll buffering is off.\n\r");
}

if (ch->prompt != NULL)
printf_to_char (ch, "Your current prompt is: %s\n\r", ch->prompt);

if (IS_SET (ch->comm, COMM_NOSHOUT))
send_to_char ("You cannot shout.\n\r", ch);
printf_to_char (ch, "You cannot shout.\n\r");
if (IS_SET (ch->comm, COMM_NOTELL))
send_to_char ("You cannot use tell.\n\r", ch);
printf_to_char (ch, "You cannot use tell.\n\r");
if (IS_SET (ch->comm, COMM_NOCHANNELS))
send_to_char ("You cannot use channels.\n\r", ch);
printf_to_char (ch, "You cannot use channels.\n\r");
if (IS_SET (ch->comm, COMM_NOEMOTE))
send_to_char ("You cannot show emotions.\n\r", ch);
printf_to_char (ch, "You cannot show emotions.\n\r");
}

/* RT deaf blocks out all shouts */
Expand Down Expand Up @@ -574,10 +574,10 @@ DEFINE_DO_FUN (do_pose) {

DEFINE_DO_FUN (do_bug) {
append_file (ch, BUG_FILE, argument);
send_to_char ("Bug logged.\n\r", ch);
printf_to_char (ch, "Bug logged.\n\r");
}

DEFINE_DO_FUN (do_typo) {
append_file (ch, TYPO_FILE, argument);
send_to_char ("Typo logged.\n\r", ch);
printf_to_char (ch, "Typo logged.\n\r");
}
40 changes: 20 additions & 20 deletions src/act_conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void do_colour_one (CHAR_T *ch, const COLOUR_SETTING_T *setting,
/* Is this the beginning of our menu? */
if (buf[0] == '\0') {
if (colour != NULL)
send_to_char ("The following colours have been set:\n\r", ch);
printf_to_char (ch, "The following colours have been set:\n\r");
strcat (buf,
" Code | Name | Color\n\r"
"-------------------------------------------------------------------------\n\r");
Expand Down Expand Up @@ -93,26 +93,26 @@ void do_colour_codes (CHAR_T *ch, char *argument) {
flag_t last_mask = 0;
int i, col = 0;

send_to_char ("Valid colours:\n\r", ch);
printf_to_char (ch, "Valid colours:\n\r");
for (i = 0; colour_table[i].name != NULL; i++) {
if (last_mask != 0 && colour_table[i].mask != last_mask) {
if (col != 0)
send_to_char ("\n\r", ch);
printf_to_char (ch, "\n\r");
col = 0;
}
if (col == 0)
send_to_char (" ", ch);
printf_to_char (ch, " ");

last_mask = colour_table[i].mask;
printf_to_char (ch, "%-15s", colour_table[i].name);

if (++col == 4) {
send_to_char ("\n\r", ch);
printf_to_char (ch, "\n\r");
col = 0;
}
}
if (col != 0)
send_to_char ("\n\r", ch);
printf_to_char (ch, "\n\r");
}

/* changes your scroll */
Expand All @@ -123,7 +123,7 @@ DEFINE_DO_FUN (do_scroll) {
one_argument (argument, arg);
if (arg[0] == '\0') {
if (ch->lines == 0)
send_to_char ("You do not page long messages.\n\r", ch);
printf_to_char (ch, "You do not page long messages.\n\r");
else {
printf_to_char (ch, "You currently display %d lines per page.\n\r",
ch->lines + 2);
Expand All @@ -135,7 +135,7 @@ DEFINE_DO_FUN (do_scroll) {

lines = atoi (arg);
if (lines == 0) {
send_to_char ("Paging disabled.\n\r", ch);
printf_to_char (ch, "Paging disabled.\n\r");
ch->lines = 0;
return;
}
Expand Down Expand Up @@ -242,8 +242,8 @@ DEFINE_DO_FUN (do_autolist) {
BAIL_IF (IS_NPC (ch),
"NPCs can't use player flags.\n\r", ch);

send_to_char (" action status\n\r", ch);
send_to_char ("---------------------------\n\r", ch);
printf_to_char (ch, " action status\n\r");
printf_to_char (ch, "---------------------------\n\r");

do_autolist_ext_flag ("autoassist", ch, ch->ext_plr, PLR_AUTOASSIST);
do_autolist_ext_flag ("autoexit", ch, ch->ext_plr, PLR_AUTOEXIT);
Expand All @@ -252,7 +252,7 @@ DEFINE_DO_FUN (do_autolist) {
do_autolist_ext_flag ("autosac", ch, ch->ext_plr, PLR_AUTOSAC);
do_autolist_ext_flag ("autosplit", ch, ch->ext_plr, PLR_AUTOSPLIT);

send_to_char ("---------------------------\n\r", ch);
printf_to_char (ch, "---------------------------\n\r");
do_autolist_flag ("telnetga", ch, ch->comm, COMM_TELNET_GA);
do_autolist_flag ("brief", ch, ch->comm, COMM_BRIEF);
do_autolist_flag ("compactmode", ch, ch->comm, COMM_COMPACT);
Expand All @@ -263,7 +263,7 @@ DEFINE_DO_FUN (do_autolist) {
do_autolist_flag ("materials", ch, ch->comm, COMM_MATERIALS);
#endif

send_to_char ("---------------------------\n\r", ch);
printf_to_char (ch, "---------------------------\n\r");
do_autolist_ext_flag ("noloot", ch, EXT_INVERTED (ch->ext_plr), PLR_CANLOOT);
do_autolist_ext_flag ("nosummon", ch, ch->ext_plr, PLR_NOSUMMON);
do_autolist_ext_flag ("nofollow", ch, ch->ext_plr, PLR_NOFOLLOW);
Expand Down Expand Up @@ -379,7 +379,7 @@ DEFINE_DO_FUN (do_autoall) {
EXT_SET (ch->ext_plr, PLR_AUTOLOOT);
EXT_SET (ch->ext_plr, PLR_AUTOSAC);
EXT_SET (ch->ext_plr, PLR_AUTOSPLIT);
send_to_char ("All autos turned on.\n\r", ch);
printf_to_char (ch, "All autos turned on.\n\r");
}
else if (!strcmp (argument, "off")) {
EXT_UNSET (ch->ext_plr, PLR_AUTOASSIST);
Expand All @@ -388,10 +388,10 @@ DEFINE_DO_FUN (do_autoall) {
EXT_UNSET (ch->ext_plr, PLR_AUTOLOOT);
EXT_UNSET (ch->ext_plr, PLR_AUTOSAC);
EXT_UNSET (ch->ext_plr, PLR_AUTOSPLIT);
send_to_char ("All autos turned off.\n\r", ch);
printf_to_char (ch, "All autos turned off.\n\r");
}
else
send_to_char ("Usage: autoall [on|off]\n\r", ch);
printf_to_char (ch, "Usage: autoall [on|off]\n\r");
}

DEFINE_DO_FUN (do_prompt) {
Expand Down Expand Up @@ -426,7 +426,7 @@ DEFINE_DO_FUN (do_prompt) {
}

DEFINE_DO_FUN (do_alia) {
send_to_char ("I'm sorry, alias must be entered in full.\n\r", ch);
printf_to_char (ch, "I'm sorry, alias must be entered in full.\n\r");
}

DEFINE_DO_FUN (do_alias) {
Expand All @@ -444,7 +444,7 @@ DEFINE_DO_FUN (do_alias) {
BAIL_IF (rch->pcdata->alias[0] == NULL,
"You have no aliases defined.\n\r", ch);

send_to_char ("Your current aliases are:\n\r", ch);
printf_to_char (ch, "Your current aliases are:\n\r");
for (pos = 0; pos < MAX_ALIAS; pos++) {
if (rch->pcdata->alias[pos] == NULL
|| rch->pcdata->alias_sub[pos] == NULL)
Expand Down Expand Up @@ -477,7 +477,7 @@ DEFINE_DO_FUN (do_alias) {
return;
}
}
send_to_char ("That alias is not defined.\n\r", ch);
printf_to_char (ch, "That alias is not defined.\n\r");
return;
}

Expand Down Expand Up @@ -530,7 +530,7 @@ DEFINE_DO_FUN (do_unalias) {
}

if (!strcmp (arg, rch->pcdata->alias[pos])) {
send_to_char ("Alias removed.\n\r", ch);
printf_to_char (ch, "Alias removed.\n\r");
str_free (&(rch->pcdata->alias[pos]));
str_free (&(rch->pcdata->alias_sub[pos]));
rch->pcdata->alias[pos] = NULL;
Expand All @@ -540,5 +540,5 @@ DEFINE_DO_FUN (do_unalias) {
}

if (!found)
send_to_char ("No alias of that name to remove.\n\r", ch);
printf_to_char (ch, "No alias of that name to remove.\n\r");
}
Loading