From bb407e4e657c80115af8a8f5717e1f6f6dc61043 Mon Sep 17 00:00:00 2001 From: hemagx Date: Sat, 12 Dec 2015 12:52:28 +0200 Subject: Change all chat mute checks to use pc->can_talk instead of direct check. Put new macro pc_ismuted and change all other kind of mutes to use it Closes #937 as merged Signed-off-by: Haru --- src/map/pc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index d5d68d299..567348d20 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -4884,7 +4884,7 @@ int pc_useitem(struct map_session_data *sd,int n) { sd->sc.data[SC_DEEP_SLEEP] || sd->sc.data[SC_SATURDAY_NIGHT_FEVER] || sd->sc.data[SC_COLD] || - (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM) + pc_ismuted(&sd->sc, MANNER_NOITEM) )) return 0; @@ -8875,7 +8875,7 @@ bool pc_can_talk( struct map_session_data *sd ) { if( sd->sc.data[SC_BERSERK] || (sd->sc.data[SC_DEEP_SLEEP] && sd->sc.data[SC_DEEP_SLEEP]->val2) || - (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT) ) + pc_ismuted(&sd->sc, MANNER_NOCHAT) ) return false; return true; -- cgit v1.2.3-60-g2f50