diff options
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/pc.h | 2 | ||||
| -rw-r--r-- | src/map/status.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index f6c7a0947..e560df549 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -688,7 +688,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 diff --git a/src/map/status.c b/src/map/status.c index d2d65ce37..9a274c080 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -8056,7 +8056,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); |