diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-28 20:44:44 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-28 20:44:44 +0000 |
| commit | dd9f935197123a63faa902fcfdf166a99f7080b7 (patch) | |
| tree | 019c5a6ba0812f7001b58267d72fe5c2cbfeebf3 /src/map/unit.c | |
| parent | d70d0a66866d8c41cf6a8c9df266c0d7ea29c3dc (diff) | |
| download | hercules-dd9f935197123a63faa902fcfdf166a99f7080b7.tar.gz hercules-dd9f935197123a63faa902fcfdf166a99f7080b7.tar.bz2 hercules-dd9f935197123a63faa902fcfdf166a99f7080b7.tar.xz hercules-dd9f935197123a63faa902fcfdf166a99f7080b7.zip | |
- Restructured CG_MOONLIT so that it is a ground effect like the other Encores.
- Modified SC_DANCING so that val1 can contain both skill id and skill lv, removed SC_MOONLIT
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8526 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/unit.c')
| -rw-r--r-- | src/map/unit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/unit.c b/src/map/unit.c index 13959e5cd..8e34eca45 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -668,11 +668,11 @@ int unit_can_move(struct block_list *bl) || sc->data[SC_BLADESTOP].timer !=-1 || sc->data[SC_BLADESTOP_WAIT].timer !=-1 || sc->data[SC_SPIDERWEB].timer !=-1 - || (sc->data[SC_DANCING].timer !=-1 && ( - (sc->data[SC_DANCING].val4 && sc->data[SC_LONGING].timer == -1) || - sc->data[SC_DANCING].val1 == CG_HERMODE //cannot move while Hermod is active. + || (sc->data[SC_DANCING].timer !=-1 && sc->data[SC_DANCING].val4 && ( + sc->data[SC_LONGING].timer == -1 || + (sc->data[SC_DANCING].val1&0xFFFF) == CG_MOONLIT || + (sc->data[SC_DANCING].val1&0xFFFF) == CG_HERMODE )) - || sc->data[SC_MOONLIT].timer != -1 || (sc->data[SC_GOSPEL].timer !=-1 && sc->data[SC_GOSPEL].val4 == BCT_SELF) // cannot move while gospel is in effect || sc->data[SC_STOP].timer != -1 || sc->data[SC_CLOSECONFINE].timer != -1 |