summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-11 05:15:16 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-11 05:15:16 +0000
commit054432d877578cc608617c4725934b302b001454 (patch)
treeb0beb366c699d38ba34075d16c75f970d5396380 /src
parentcf214277634496ff22b20c8b2f44624a0248f211 (diff)
downloadhercules-054432d877578cc608617c4725934b302b001454.tar.gz
hercules-054432d877578cc608617c4725934b302b001454.tar.bz2
hercules-054432d877578cc608617c4725934b302b001454.tar.xz
hercules-054432d877578cc608617c4725934b302b001454.zip
Fixed bugreport:5535 while caster is in shadow formation he no longer can attack or use items.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15847 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/pc.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index a321a0cf5..469bec8db 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -9225,7 +9225,7 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type,
if( sd->sc.option&(OPTION_WEDDING|OPTION_XMAS|OPTION_SUMMER) )
return;
- if( sd->sc.data[SC_BASILICA] )
+ if( sd->sc.data[SC_BASILICA] || sd->sc.data[SC__SHADOWFORM] )
return;
if (!battle_config.sdelay_attack_enable && pc_checkskill(sd, SA_FREECAST) <= 0) {
diff --git a/src/map/pc.c b/src/map/pc.c
index c761f82c5..35ced409c 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4006,6 +4006,7 @@ int pc_useitem(struct map_session_data *sd,int n)
(sd->sc.data[SC_GRAVITATION] && sd->sc.data[SC_GRAVITATION]->val3 == BCT_SELF) ||
sd->sc.data[SC_TRICKDEAD] ||
sd->sc.data[SC_HIDING] ||
+ sd->sc.data[SC__SHADOWFORM] ||
(sd->sc.data[SC_NOCHAT] && sd->sc.data[SC_NOCHAT]->val1&MANNER_NOITEM)
))
return 0;