summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-07 17:02:05 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-07 17:02:05 +0000
commit0ae3dcfe9127d512eb4f0ccec06837b586fa3bc2 (patch)
tree75de3c2fa9d34c286f88a5b7db869a2dba022b48 /src/map
parent91ab4e4c9ddaf78f81b867180f627fd52d453942 (diff)
downloadhercules-0ae3dcfe9127d512eb4f0ccec06837b586fa3bc2.tar.gz
hercules-0ae3dcfe9127d512eb4f0ccec06837b586fa3bc2.tar.bz2
hercules-0ae3dcfe9127d512eb4f0ccec06837b586fa3bc2.tar.xz
hercules-0ae3dcfe9127d512eb4f0ccec06837b586fa3bc2.zip
Fixed bug to lion howling/sc_fear status, super mega ultra ubber plus thanks to the awesome malufett
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16238 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/status.c2
-rw-r--r--src/map/unit.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 8b10b2711..5c4f4cdd7 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -964,7 +964,6 @@ void initChangeTables(void) {
StatusChangeStateTable[SC_MAGNETICFIELD] |= SCS_NOMOVE;
StatusChangeStateTable[SC__MANHOLE] |= SCS_NOMOVE;
StatusChangeStateTable[SC_VACUUM_EXTREME] |= SCS_NOMOVE;
- StatusChangeStateTable[SC_FEAR] |= SCS_NOMOVE|SCS_NOMOVECOND;
StatusChangeStateTable[SC_CURSEDCIRCLE_ATKER] |= SCS_NOMOVE;
StatusChangeStateTable[SC_CURSEDCIRCLE_TARGET] |= SCS_NOMOVE;
@@ -3423,7 +3422,6 @@ void status_calc_state( struct block_list *bl, struct status_change *sc, enum sc
|| (sc->data[SC_GRAVITATION] && sc->data[SC_GRAVITATION]->val3 == BCT_SELF)
|| (sc->data[SC_CLOAKING] && //Need wall at level 1-2
sc->data[SC_CLOAKING]->val1 < 3 && !(sc->data[SC_CLOAKING]->val4&1))
- || (sc->data[SC_FEAR] && sc->data[SC_FEAR]->val2 > 0)
) {
sc->cant.move += ( start ? 1 : -1 );
}
diff --git a/src/map/unit.c b/src/map/unit.c
index 1f8cbf4e1..af4f95350 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -886,7 +886,7 @@ int unit_can_move(struct block_list *bl)
return 0; //Can't move
if (sc) {
- if( sc->cant.move )
+ if( sc->cant.move || (sc->data[SC_FEAR] && sc->data[SC_FEAR]->val2 > 0) )
return 0;
if (sc->opt1 > 0 && sc->opt1 != OPT1_STONEWAIT && sc->opt1 != OPT1_BURNING)