diff options
| author | Haru <haru@dotalux.com> | 2020-05-04 02:22:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 02:22:16 +0200 |
| commit | 35425ce13ee5c7dd2132413ccc397d059da9153e (patch) | |
| tree | ca89f0dd1a61cbe7cc31a9596edc8ac5b7d7382f /src | |
| parent | b153063e29310f428e13789269718665c098f56b (diff) | |
| parent | fd3600c84675a59f1de2fb88024091b1eafa70af (diff) | |
| download | hercules-35425ce13ee5c7dd2132413ccc397d059da9153e.tar.gz hercules-35425ce13ee5c7dd2132413ccc397d059da9153e.tar.bz2 hercules-35425ce13ee5c7dd2132413ccc397d059da9153e.tar.xz hercules-35425ce13ee5c7dd2132413ccc397d059da9153e.zip | |
Merge pull request #2696 from Kenpachi2k13/sc_nochat_fix
Make SC_NOCHAT gets affected by battle config changes
Diffstat (limited to 'src')
| -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); |