diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-09 20:50:59 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-09 20:50:59 +0000 |
| commit | 954c80bb3682cbaf38cbbe0bf6a85626bd5d3d69 (patch) | |
| tree | 0d577e13494c1d933ea96cd44ec4749604c88409 /src/map/clif.c | |
| parent | 4780ea86190b3837ca9e80d39170feda377d72ed (diff) | |
| download | hercules-954c80bb3682cbaf38cbbe0bf6a85626bd5d3d69.tar.gz hercules-954c80bb3682cbaf38cbbe0bf6a85626bd5d3d69.tar.bz2 hercules-954c80bb3682cbaf38cbbe0bf6a85626bd5d3d69.tar.xz hercules-954c80bb3682cbaf38cbbe0bf6a85626bd5d3d69.zip | |
- Adjusted some the dance/song/encore code so that the source of an ensemble will always get checked, so that walking out of an ensemble skill should make it end now. However, since ensembles requires two characters and only one is marged as source of the ensemble.... this may not be finished, some kind of check is required so that the partner will also get a force-check and not just he who started the ensemble.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8213 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 00113eaeb..d1a0f49af 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -4748,7 +4748,7 @@ int clif_skill_setunit(struct skill_unit *unit) WBUFL(buf, 6)=unit->group->src_id;
WBUFW(buf,10)=unit->bl.x;
WBUFW(buf,12)=unit->bl.y;
- if (unit->group->state.song_dance && unit->val2&UF_ENSEMBLE) {
+ if (unit->group->state.song_dance&0x1 && unit->val2&UF_ENSEMBLE) {
WBUFB(buf,14)=unit->val2&UF_SONG?UNT_DISSONANCE:UNT_UGLYDANCE;
} else {
WBUFB(buf,14)=unit->group->unit_id;
@@ -4766,7 +4766,7 @@ int clif_skill_setunit(struct skill_unit *unit) WBUFL(buf, 6)=unit->group->src_id;
WBUFW(buf,10)=unit->bl.x;
WBUFW(buf,12)=unit->bl.y;
- if (unit->group->state.song_dance && unit->val2&UF_ENSEMBLE) {
+ if (unit->group->state.song_dance&0x1 && unit->val2&UF_ENSEMBLE) {
WBUFB(buf,14)=unit->val2&UF_SONG?UNT_DISSONANCE:UNT_UGLYDANCE;
} else {
WBUFB(buf,14)=unit->group->unit_id;
|