diff options
| author | cookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-22 01:26:48 +0000 |
|---|---|---|
| committer | cookiecrumbs <cookiecrumbs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-07-22 01:26:48 +0000 |
| commit | 04ce57ecc743ec95e79fedab7e00bc650e386d23 (patch) | |
| tree | b9a0abcfed19b711b343ef32f37e2f84bea2512e /src/map/unit.c | |
| parent | 48ae82a0d0bd24c8ba9ee622930f4d74009843e9 (diff) | |
| download | hercules-04ce57ecc743ec95e79fedab7e00bc650e386d23.tar.gz hercules-04ce57ecc743ec95e79fedab7e00bc650e386d23.tar.bz2 hercules-04ce57ecc743ec95e79fedab7e00bc650e386d23.tar.xz hercules-04ce57ecc743ec95e79fedab7e00bc650e386d23.zip | |
Added a new configuration option to allow either weapon switching to cancel SC_DANCING or not.
Fixed an issue where movement is frozen (caster) with Longing for Freedom (walking outside of the cast).
Added checks related to dancing/ensemble skills to prevent frozen characters.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16470 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 848dd6dea..507bfbb07 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -920,6 +920,14 @@ int unit_can_move(struct block_list *bl) return 0; //Can't move if (sc) { + // Ensemble checks to prevent freezing characters + if( sc->cant.move && sc->data[SC_LONGING] && !((sc->data[SC_DANCING]->val1&0xFFFF) == CG_MOONLIT)) + { + // allow movement + sc->cant.move = 0; + return 1; + } + if( sc->cant.move || (sc->data[SC_FEAR] && sc->data[SC_FEAR]->val2 > 0) || (sc->data[SC_SPIDERWEB] && sc->data[SC_SPIDERWEB]->val1) ) return 0; |