- Small cleanup on Abracadabra.

- Added UF_SONG (0x400) to differentiate songs from dances.
- Updated the skill_unit_db accordingly, ensembles should only have that flag, likewise for songs and dances.
- Added preliminar support for making a Song+Dance turn into BA_DISSONANCE cells. Beware of potential bugs as it's untested.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7428 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 10 insertions, 2 deletions

diff --git a/src/map/clif.c b/src/map/clif.c
index 30e0c1cd1..e9821bcd5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -4653,7 +4653,11 @@ 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;

-		WBUFB(buf,14)=unit->group->unit_id;

+		if (unit->group->state.song_dance && unit->val1 == BA_DISSONANCE) {

+			WBUFB(buf,14)=UNT_DISSONANCE;

+		} else {

+			WBUFB(buf,14)=unit->group->unit_id;

+		}

 		WBUFB(buf,15)=1;

 		WBUFB(buf,16)=1;

 		memcpy(WBUFP(buf,17),unit->group->valstr,MESSAGE_SIZE);

@@ -4667,7 +4671,11 @@ 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;

-	WBUFB(buf,14)=unit->group->unit_id;

+	if (unit->group->state.song_dance && unit->val1 == BA_DISSONANCE) {

+		WBUFB(buf,14)=UNT_DISSONANCE;

+	} else {

+		WBUFB(buf,14)=unit->group->unit_id;

+	}

 	WBUFB(buf,15)=0;

 	clif_send(buf,packet_len_table[0x11f],&unit->bl,AREA);

 	return 0;