diff options
Diffstat (limited to 'FICS/talkproc.c')
| -rw-r--r-- | FICS/talkproc.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/FICS/talkproc.c b/FICS/talkproc.c index 85da66d..601f43b 100644 --- a/FICS/talkproc.c +++ b/FICS/talkproc.c @@ -33,6 +33,9 @@ Markus Uhlin 24/01/04 Fixed pprintf() calls Markus Uhlin 24/04/14 Refactored and reformatted ALL functions. + Markus Uhlin 25/01/18 Fixed -Wshadow + Markus Uhlin 25/04/04 tell: fixed constant expression + result */ #include "stdinclude.h" @@ -295,8 +298,8 @@ tell(int p, int p1, char *msg, int why, int ch) } if (player_censored(p1, p) && parray[p].adminLevel == 0) { - if (why != TELL_KIBITZ || - why != TELL_WHISPER || + if (why != TELL_KIBITZ && + why != TELL_WHISPER && why != TELL_CHANNEL) { pprintf(p, "Player \"%s\" is censoring you.\n", parray[p1].name); @@ -830,7 +833,7 @@ com_messages(int p, param_list param) } if (param[0].type == TYPE_NULL) { - player_show_messages (p); + player_show_messages(p); } else if (param[0].type == TYPE_WORD) { if (param[1].type != TYPE_NULL) return com_sendmessage(p, param); @@ -968,10 +971,10 @@ com_qtell(int p, param_list param) return COM_OK; } - mstrlcpy(buffer1, ":\0", sizeof buffer1); - mstrlcpy(buffer2, ":\0", sizeof buffer2); - mstrlcpy(buffer3, ":\0", sizeof buffer3); - mstrlcpy(buffer4, ":\0", sizeof buffer4); + mstrlcpy(buffer1, ":", sizeof buffer1); + mstrlcpy(buffer2, ":", sizeof buffer2); + mstrlcpy(buffer3, ":", sizeof buffer3); + mstrlcpy(buffer4, ":", sizeof buffer4); msnprintf(tmp, sizeof tmp, "%s", param[1].val.string); @@ -1034,7 +1037,6 @@ com_qtell(int p, param_list param) pprintf(p, "*qtell %s 0*\n", parray[p1].name); } else { int ch = param[0].val.integer; - int p1; if (ch == 0) { pprintf(p, "*qtell %d 1*\n", param[0].val.integer); |