From 07871308ff4b593375ab6520eed305b3d5948e22 Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Tue, 14 Apr 2020 20:47:39 +0200 Subject: Change pc_ismuted() macro to compare against battle_config.manner_system --- src/map/pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map') diff --git a/src/map/pc.h b/src/map/pc.h index 2699b7882..153f2ee36 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -687,7 +687,7 @@ END_ZEROED_BLOCK; #define pc_ishiding(sd) ( (sd)->sc.option&(OPTION_HIDE|OPTION_CLOAK|OPTION_CHASEWALK) ) #define pc_iscloaking(sd) ( !((sd)->sc.option&OPTION_CHASEWALK) && ((sd)->sc.option&OPTION_CLOAK) ) #define pc_ischasewalk(sd) ( (sd)->sc.option&OPTION_CHASEWALK ) -#define pc_ismuted(sc,type) ( (sc)->data[SC_NOCHAT] && (sc)->data[SC_NOCHAT]->val1&(type) ) +#define pc_ismuted(sc, type) ( (sc)->data[SC_NOCHAT] != NULL && (battle_config.manner_system & (type)) != 0 ) #define pc_isvending(sd) ((sd)->state.vending || (sd)->state.prevend || (sd)->state.buyingstore) #ifdef NEW_CARTS -- cgit v1.2.3-70-g09d2 From fd3600c84675a59f1de2fb88024091b1eafa70af Mon Sep 17 00:00:00 2001 From: Kenpachi Developer Date: Tue, 14 Apr 2020 20:49:56 +0200 Subject: Remove val1=battle_config.manner_system assignment for SC_NOCHAT --- src/map/status.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/map') diff --git a/src/map/status.c b/src/map/status.c index d3e85e5be..a13283f3b 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8052,7 +8052,6 @@ static int status_change_start_sub(struct block_list *src, struct block_list *bl // This is done this way because the message that the client displays is hardcoded, and only // shows how many minutes are remaining. [Panikon] total_tick = 60000; - val1 = battle_config.manner_system; //Mute filters. if (sd) { clif->changestatus(sd,SP_MANNER,sd->status.manner); -- cgit v1.2.3-70-g09d2