diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-07-07 06:02:14 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-07-15 20:36:21 +0300 |
commit | eb54c762a3e9ca00fab5ff94a082861e1b70c0e0 (patch) | |
tree | ab3e0b504325ee704f28c4f3d2411b4588264644 /src/map | |
parent | 3e04d41cc450f65f004a6e5a45c5ce6f700b82b1 (diff) | |
download | hercules-eb54c762a3e9ca00fab5ff94a082861e1b70c0e0.tar.gz hercules-eb54c762a3e9ca00fab5ff94a082861e1b70c0e0.tar.bz2 hercules-eb54c762a3e9ca00fab5ff94a082861e1b70c0e0.tar.xz hercules-eb54c762a3e9ca00fab5ff94a082861e1b70c0e0.zip |
Update packet ZC_PROPERTY_HOMUN.
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/clif.c | 87 | ||||
-rw-r--r-- | src/map/packets_struct.h | 37 |
2 files changed, 75 insertions, 49 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 95184ed9f..5feda609e 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -1615,17 +1615,8 @@ static bool clif_spawn(struct block_list *bl) static void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int flag) { struct status_data *hstatus; - unsigned char buf[128]; enum homun_type htype; - int offset = 0; - -// probably can works also for < 20141223, but in 3CeaM packet size defined only for 20150513 -#if PACKETVER < 20150513 - int cmd = 0x22e; -#else - int cmd = 0x9f7; -#endif - int len = packet_len(cmd); + struct PACKET_ZC_PROPERTY_HOMUN p; nullpo_retv(sd); nullpo_retv(hd); @@ -1633,75 +1624,73 @@ static void clif_hominfo(struct map_session_data *sd, struct homun_data *hd, int hstatus = &hd->battle_status; htype = homun->class2type(hd->homunculus.class_); - memset(buf, 0, len); - WBUFW(buf, 0) = cmd; - memcpy(WBUFP(buf, 2), hd->homunculus.name, NAME_LENGTH); + memset(&p, 0, sizeof(p)); + p.packetType = hominfoType; + memcpy(p.name, hd->homunculus.name, NAME_LENGTH); // Bit field, bit 0 : rename_flag (1 = already renamed), bit 1 : homunc vaporized (1 = true), bit 2 : homunc dead (1 = true) - WBUFB(buf, 26) = (!battle_config.hom_rename && hd->homunculus.rename_flag ? 0x1 : 0x0) | (hd->homunculus.vaporize == HOM_ST_REST ? 0x2 : 0) | (hd->homunculus.hp > 0 ? 0x4 : 0); - WBUFW(buf, 27) = hd->homunculus.level; - WBUFW(buf, 29) = hd->homunculus.hunger; - WBUFW(buf, 31) = (unsigned short) (hd->homunculus.intimacy / 100) ; - WBUFW(buf, 33) = 0; // equip id + p.flags = (!battle_config.hom_rename && hd->homunculus.rename_flag ? 0x1 : 0x0) | (hd->homunculus.vaporize == HOM_ST_REST ? 0x2 : 0) | (hd->homunculus.hp > 0 ? 0x4 : 0); + p.level = hd->homunculus.level; + p.hunger = hd->homunculus.hunger; + p.intimacy = hd->homunculus.intimacy / 100; + p.itemId = 0; // equip id #ifdef RENEWAL - WBUFW(buf, 35) = cap_value(hstatus->rhw.atk2, 0, INT16_MAX); + p.atk2 = cap_value(hstatus->rhw.atk2, 0, INT16_MAX); #else - WBUFW(buf,35) = cap_value(hstatus->rhw.atk2 + hstatus->batk, 0, INT16_MAX); + p.atk2 = cap_value(hstatus->rhw.atk2 + hstatus->batk, 0, INT16_MAX); #endif - WBUFW(buf,37) = cap_value(hstatus->matk_max, 0, INT16_MAX); - WBUFW(buf,39) = hstatus->hit; + p.matk = cap_value(hstatus->matk_max, 0, INT16_MAX); + p.hit = hstatus->hit; if (battle_config.hom_setting&0x10) - WBUFW(buf, 41) = hstatus->luk / 3 + 1; //crit is a +1 decimal value! Just display purpose.[Vicious] + p.crit = hstatus->luk / 3 + 1; //crit is a +1 decimal value! Just display purpose.[Vicious] else - WBUFW(buf, 41) = hstatus->cri / 10; + p.crit = hstatus->cri / 10; #ifdef RENEWAL - WBUFW(buf, 43) = hstatus->def + hstatus->def2; - WBUFW(buf, 45) = hstatus->mdef + hstatus->mdef2; + p.def = hstatus->def + hstatus->def2; + p.mdef = hstatus->mdef + hstatus->mdef2; #else - WBUFW(buf, 43) =hstatus->def + hstatus->vit ; - WBUFW(buf, 45) = hstatus->mdef; + p.def = hstatus->def + hstatus->vit ; + p.mdef = hstatus->mdef; #endif - WBUFW(buf, 47) = hstatus->flee; - WBUFW(buf, 49) = (flag) ? 0 : hstatus->amotion; + p.flee = hstatus->flee; + p.amotion = (flag) ? 0 : hstatus->amotion; // probably can works also for < 20141223, but in 3CeaM packet size defined only for 20150513 #if PACKETVER < 20150513 if (hstatus->max_hp > INT16_MAX) { - WBUFW(buf, 51) = hstatus->hp / (hstatus->max_hp / 100); - WBUFW(buf, 53) = 100; + p.hp = hstatus->hp / (hstatus->max_hp / 100); + p.maxHp = 100; } else { - WBUFW(buf, 51) = hstatus->hp; - WBUFW(buf, 53) = hstatus->max_hp; + p.hp = hstatus->hp; + p.maxHp = hstatus->max_hp; } #else - WBUFL(buf, 51) = hstatus->hp; - WBUFL(buf, 55) = hstatus->max_hp; - offset = 4; + p.hp = hstatus->hp; + p.maxHp = hstatus->max_hp; #endif if (hstatus->max_sp > INT16_MAX) { - WBUFW(buf, 55 + offset) = hstatus->sp / (hstatus->max_sp / 100); - WBUFW(buf, 57 + offset) = 100; + p.sp = hstatus->sp / (hstatus->max_sp / 100); + p.maxSp = 100; } else { - WBUFW(buf, 55 + offset) = hstatus->sp; - WBUFW(buf, 57 + offset) = hstatus->max_sp; + p.sp = hstatus->sp; + p.maxSp = hstatus->max_sp; } - WBUFL(buf, 59 + offset) = hd->homunculus.exp; - WBUFL(buf, 63 + offset) = hd->exp_next; + p.exp = hd->homunculus.exp; + p.expNext = hd->exp_next; switch (htype) { case HT_REG: case HT_EVO: if (hd->homunculus.level >= battle_config.hom_max_level) - WBUFL(buf, 63 + offset) = 0; + p.expNext = 0; break; case HT_S: if (hd->homunculus.level >= battle_config.hom_S_max_level) - WBUFL(buf, 63 + offset) = 0; + p.expNext = 0; break; } - WBUFW(buf, 67 + offset) = hd->homunculus.skillpts; - WBUFW(buf, 69 + offset) = status_get_range(&hd->bl); - - clif->send(buf, len, &sd->bl, SELF); + p.skillPoints = hd->homunculus.skillpts; + p.range = status_get_range(&hd->bl); + clif->send(&p, sizeof(p), &sd->bl, SELF); } /// Notification about a change in homunuculus' state (ZC_CHANGESTATE_MER). diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 778a65050..30c5087e1 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -395,6 +395,12 @@ enum packet_headers { #else buyingStoreUpdateItemType = 0x81b, #endif +// probably can works also for < 20141223, but in 3CeaM packet size defined only for 20150513 +#if PACKETVER >= 20150513 + hominfoType = 0x9f7, +#else + hominfoType = 0x22e, +#endif }; #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute @@ -2080,6 +2086,37 @@ struct PACKET_ZC_ACK_WEAPONREFINE { #endif } __attribute__((packed)); +struct PACKET_ZC_PROPERTY_HOMUN { + int16 packetType; + char name[NAME_LENGTH]; + // Bit field, bit 0 : rename_flag (1 = already renamed), bit 1 : homunc vaporized (1 = true), bit 2 : homunc dead (1 = true) + uint8 flags; + uint16 level; + uint16 hunger; + uint16 intimacy; +#if PACKETVER_RE_NUM >= 20180704 + uint32 itemId; +#else + uint16 itemId; +#endif + uint16 atk2; + uint16 matk; + uint16 hit; + uint16 crit; + uint16 def; + uint16 mdef; + uint16 flee; + uint16 amotion; + uint32 hp; + uint32 maxHp; + uint16 sp; + uint16 maxSp; + uint32 exp; + uint32 expNext; + uint16 skillPoints; + uint16 range; +} __attribute__((packed)); + #if !defined(sun) && (!defined(__NETBSD__) || __NetBSD_Version__ >= 600000000) // NetBSD 5 and Solaris don't like pragma pack but accept the packed attribute #pragma pack(pop) #endif // not NetBSD < 6 / Solaris |