diff options
| author | shennetsind <ind@henn.et> | 2013-07-08 11:18:04 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-07-08 11:18:04 -0300 |
| commit | 4abfdc61a3031db5701613807bcd4ecee4434a00 (patch) | |
| tree | e3b7b26410202e32d1398ce6c7e89d7a5119dcf3 /src/map/atcommand.c | |
| parent | 939d15818b6f17913a12175e197ac7aea1e2e05d (diff) | |
| parent | 713bc4da082e8b240ca6e0d9551c21c2931eece5 (diff) | |
| download | hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.gz hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.bz2 hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.tar.xz hercules-4abfdc61a3031db5701613807bcd4ecee4434a00.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 2aaf89107..e8165e4a3 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6177,7 +6177,7 @@ ACMD(npctalk) unsigned long color=0; if (sd->sc.count && //no "chatting" while muted. - (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_DEEP_SLEEP] || sd->sc.data[SC__BLOODYLUST] || + (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_DEEP_SLEEP] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT))) return false; @@ -6228,7 +6228,7 @@ ACMD(pettalk) } if (sd->sc.count && //no "chatting" while muted. - (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_DEEP_SLEEP] || sd->sc.data[SC__BLOODYLUST] || + (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_DEEP_SLEEP] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT))) return false; @@ -6994,7 +6994,7 @@ ACMD(homtalk) } if (sd->sc.count && //no "chatting" while muted. - (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_DEEP_SLEEP] || sd->sc.data[SC__BLOODYLUST] || + (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_DEEP_SLEEP] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT))) return false; @@ -7377,7 +7377,7 @@ ACMD(me) memset(atcmd_output, '\0', sizeof(atcmd_output)); if (sd->sc.count && //no "chatting" while muted. - (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_DEEP_SLEEP] || sd->sc.data[SC__BLOODYLUST] || + (sd->sc.data[SC_BERSERK] || sd->sc.data[SC_DEEP_SLEEP] || (sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOCHAT))) return false; |