diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-02 14:27:17 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-02 14:27:17 +0000 |
commit | f49effe3403a77b3fb69078465a2906836547041 (patch) | |
tree | 7073c6a028721f9edae7ecd126344a3440f007d5 /src/map/clif.c | |
parent | 9575f26807e2e508af9108d3c69c0e332a7f61cc (diff) | |
download | hercules-f49effe3403a77b3fb69078465a2906836547041.tar.gz hercules-f49effe3403a77b3fb69078465a2906836547041.tar.bz2 hercules-f49effe3403a77b3fb69078465a2906836547041.tar.xz hercules-f49effe3403a77b3fb69078465a2906836547041.zip |
- Updated battle_check_target so that all alchemist summoned mobs can be target by everyone.
- Cleaned up skill_check_condition_mob_master_sub, it will now count both total number of summoned mobs and amount that belong to the same type.
- Corrected AM_CANNIBALIZE so it will fail if you already have plants of another type out.
- Using NPC_SELFDESTRUCTION no longer will make the caster stop walking.
- Removed SI_GUILDAURA, and replaced it with SI_LANDENDOW, now Volcano/Deluge/V. Gale will get that funky icon instead.
- Changed clif_hominfo to receive both sd and hd as parameters
- Some redundancy cleaning in mercenary.c
- Moved updating of sd->mercenary.hp from merc_damage to pc_makesavestatus.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8048 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
-rw-r--r-- | src/map/clif.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 3c5879c8b..924218c27 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1455,9 +1455,8 @@ int clif_spawn(struct block_list *bl) }
//[orn]
-int clif_hominfo(struct map_session_data *sd, int flag)
+int clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag)
{
- struct homun_data *hd = sd->hd;
struct status_data *status;
unsigned char buf[128];
@@ -1472,7 +1471,7 @@ int clif_hominfo(struct map_session_data *sd, int flag) WBUFB(buf,26)=sd->homunculus.rename_flag | (sd->homunculus.vaporize << 1) | (sd->homunculus.hp?0:4);
WBUFW(buf,27)=sd->homunculus.level;
WBUFW(buf,29)=sd->homunculus.hunger;
- WBUFW(buf,31)=(unsigned short) (hd->master->homunculus.intimacy / 100) ;
+ WBUFW(buf,31)=(unsigned short) (sd->homunculus.intimacy / 100) ;
WBUFW(buf,33)=0; // equip id
WBUFW(buf,35)=status->rhw.atk2;
WBUFW(buf,37)=status->matk_max;
@@ -1574,7 +1573,7 @@ void clif_parse_ChangeHomunculusName(int fd, struct map_session_data *sd) { //[o RFIFOHEAD(fd);
memcpy(sd->homunculus.name,RFIFOP(fd,2),24);
sd->homunculus.rename_flag = 1;
- clif_hominfo(sd,0);
+ clif_hominfo(sd,sd->hd,0);
clif_charnameack(sd->fd,&sd->hd->bl);
}
@@ -8277,8 +8276,8 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd) map_addblock(&sd->hd->bl);
clif_spawn(&sd->hd->bl);
// clif_homunack(sd);
- clif_hominfo(sd,1);
- clif_hominfo(sd,0); //for some reason, at least older clients want this sent twice
+ clif_hominfo(sd,sd->hd,1);
+ clif_hominfo(sd,sd->hd,0); //for some reason, at least older clients want this sent twice
clif_send_homdata(sd,0,0);
clif_homskillinfoblock(sd);
}
|