diff options
| author | shennetsind <ind@henn.et> | 2013-03-09 14:58:25 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-03-09 14:58:25 -0300 |
| commit | 70a3d73ac5205c0a830dc32e220bfa38f355208d (patch) | |
| tree | 56c488e37ee2a96b9296d14a080e5988384352d7 /src/map/clif.c | |
| parent | 496abaabbeb22b13c74a454817705736f421605c (diff) | |
| download | hercules-70a3d73ac5205c0a830dc32e220bfa38f355208d.tar.gz hercules-70a3d73ac5205c0a830dc32e220bfa38f355208d.tar.bz2 hercules-70a3d73ac5205c0a830dc32e220bfa38f355208d.tar.xz hercules-70a3d73ac5205c0a830dc32e220bfa38f355208d.zip | |
Dropping StatusChangeStateTable
We've discussed, and decided that this feature's improvement is not worth the hassle it creates. Gepard was right, and I was stupidly wrong.
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index ed9eb1769..0ddc5f6ea 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -10116,7 +10116,14 @@ void clif_parse_TakeItem(int fd, struct map_session_data *sd) if (fitem == NULL || fitem->bl.type != BL_ITEM || fitem->bl.m != sd->bl.m) break; - if( sd->sc.cant.pickup ) + if( sd->sc.count && ( + sd->sc.data[SC_HIDING] || + sd->sc.data[SC_CLOAKING] || + sd->sc.data[SC_TRICKDEAD] || + sd->sc.data[SC_BLADESTOP] || + sd->sc.data[SC_CLOAKINGEXCEED] || + (sd->sc.data[SC_NOCHAT] &&sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM) + ) ) break; if (pc_cant_act(sd)) |