diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-05 20:57:15 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-10-05 20:57:15 +0000 |
| commit | a3cdfd61f51665f63a5e05df7e40cf65024e9093 (patch) | |
| tree | 416c3f2e49307fe46f7265b9a2a4f0076a9bdd23 | |
| parent | b1ef927f18b6093477087e60b1ee1c34d6661f5f (diff) | |
| download | hercules-a3cdfd61f51665f63a5e05df7e40cf65024e9093.tar.gz hercules-a3cdfd61f51665f63a5e05df7e40cf65024e9093.tar.bz2 hercules-a3cdfd61f51665f63a5e05df7e40cf65024e9093.tar.xz hercules-a3cdfd61f51665f63a5e05df7e40cf65024e9093.zip | |
* REALLY fixed emblem not displaying when a char logs in (compromise between r10624 and r11033 that hopefully works)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11369 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/clif.c | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index bc28b85b3..87efc60de 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2007/10/05 + * REALLY fixed emblem not displaying when a char logs in + (compromise between r10624 and r11033 that hopefully works) * Fixed 'Wink of Charm' - shouldn't work on boss mobs (topic:166115) * Removed a broken remnant of code from old gospel code (r4349) that's _supposed_ to clear the gospel status (no item use?) when you step diff --git a/src/map/clif.c b/src/map/clif.c index 198220e5d..78917e5c1 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -7796,26 +7796,28 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) clif_updatestatus(sd,SP_MAXWEIGHT); clif_updatestatus(sd,SP_WEIGHT); + // guild + // (needs to go before clif_spawn() to show guild emblems correctly) + if(sd->status.guild_id) + guild_send_memberinfoshort(sd,1); + if(battle_config.pc_invincible_time > 0) { if(map_flag_gvg(sd->bl.m)) pc_setinvincibletimer(sd,battle_config.pc_invincible_time<<1); else pc_setinvincibletimer(sd,battle_config.pc_invincible_time); } - map_addblock(&sd->bl); // ubNo^ - clif_spawn(&sd->bl); // spawn + map_addblock(&sd->bl); + clif_spawn(&sd->bl); // Party + // (needs to go after clif_spawn() to show hp bars correctly) if(sd->status.party_id) { party_send_movemap(sd); clif_party_hp(sd); // Show hp after displacement [LuzZza] } - // guild - if(sd->status.guild_id) - guild_send_memberinfoshort(sd,1); - if(map[sd->bl.m].flag.pvp) { if(!battle_config.pk_mode) { // remove pvp stuff for pk_mode [Valaris] if (!map[sd->bl.m].flag.pvp_nocalcrank) |