diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-07 11:37:52 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-07 11:37:52 +0000 |
commit | add1b9295f212b61ad4efe3e1b6a94a16bce8601 (patch) | |
tree | 5a3b3c1c70d2ab701f9c40c3da9f24f4b5e68f3d /src/map | |
parent | d9e53af66fff2826442f2157c09d9bdb81f43968 (diff) | |
download | hercules-add1b9295f212b61ad4efe3e1b6a94a16bce8601.tar.gz hercules-add1b9295f212b61ad4efe3e1b6a94a16bce8601.tar.bz2 hercules-add1b9295f212b61ad4efe3e1b6a94a16bce8601.tar.xz hercules-add1b9295f212b61ad4efe3e1b6a94a16bce8601.zip |
Devotion links will now be sent properly in all situations (followup to 12171).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12772 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/clif.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 5f807a86f..ee764f3c6 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3335,6 +3335,7 @@ int clif_storageclose(struct map_session_data *sd) *------------------------------------------*/ static void clif_getareachar_pc(struct map_session_data* sd,struct map_session_data* dstsd) { + struct map_session_data* tmpsd; int gmlvl; int i; @@ -3357,12 +3358,15 @@ static void clif_getareachar_pc(struct map_session_data* sd,struct map_session_d ) clif_hpmeter_single(sd->fd, dstsd->bl.id, dstsd->battle_status.hp, dstsd->battle_status.max_hp); - // display links to devoted chars for crusader + // display link (sd - dstsd) to sd ARR_FIND( 0, 5, i, sd->devotion[i] == dstsd->bl.id ); if( i < 5 ) clif_devotion(sd, sd); - // display links to devoted chars for others + // display links (dstsd - devotees) to sd ARR_FIND( 0, 5, i, dstsd->devotion[i] > 0 ); if( i < 5 ) clif_devotion(dstsd, sd); + // display link (dstsd - crusader) to sd + if( dstsd->sc.data[SC_DEVOTION] && (tmpsd = map_id2sd(dstsd->sc.data[SC_DEVOTION]->val1)) != NULL ) + clif_devotion(tmpsd, sd); // pvp circle for duel [LuzZza] //if(dstsd->duel_group) |