diff options
| author | Michieru <michieru@0-mail.com> | 2014-02-14 01:47:39 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-02-14 02:26:58 +0100 |
| commit | 6f264513874c80b912f47dbad1ec0347c67534e7 (patch) | |
| tree | 51b684f659608eeca522c8095335340d5b846c95 /src/map/atcommand.c | |
| parent | 0642abcf9ef6e76861ee7d4b1a0b7f8bcd83f31f (diff) | |
| download | hercules-6f264513874c80b912f47dbad1ec0347c67534e7.tar.gz hercules-6f264513874c80b912f47dbad1ec0347c67534e7.tar.bz2 hercules-6f264513874c80b912f47dbad1ec0347c67534e7.tar.xz hercules-6f264513874c80b912f47dbad1ec0347c67534e7.zip | |
Renewal mechanics rebalance mega-update
- More info on the forums, at
http://hercules.ws/board/topic/4428-michierus-renewal-update/
Signed-off-by: Haru <haru@dotalux.com>
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 2849ada0b..d39004c74 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -6072,7 +6072,7 @@ ACMD(npctalk) unsigned int 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_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))) return false; @@ -6121,7 +6121,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_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))) return false; @@ -6912,7 +6912,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_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))) return false; @@ -7287,7 +7287,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_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))) return false; |