diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-17 06:52:06 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-17 06:52:06 +0000 |
| commit | 50d4640a538e16e718e8192ca12bc5ade1a7387f (patch) | |
| tree | 119860d6e35ae3e60e751029f5aa99fed5ebc0dc /src/map/clif.c | |
| parent | 4f499fb621d773df8fde389b2b3a281b866b3213 (diff) | |
| download | hercules-50d4640a538e16e718e8192ca12bc5ade1a7387f.tar.gz hercules-50d4640a538e16e718e8192ca12bc5ade1a7387f.tar.bz2 hercules-50d4640a538e16e718e8192ca12bc5ade1a7387f.tar.xz hercules-50d4640a538e16e718e8192ca12bc5ade1a7387f.zip | |
- Fixed the party HP packets to send max HP 10000 and scale HP accordingly when the player's HP doesn't fits in the packet's field. Fixes HP bars not correctly displaying the % of life when max HP is above 32k.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7218 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 7e3821ee2..7abe50aa3 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -5941,8 +5941,13 @@ int clif_party_hp(struct map_session_data *sd) WBUFW(buf,0)=0x106;
WBUFL(buf,2)=sd->status.account_id;
- WBUFW(buf,6)=(sd->battle_status.hp > SHRT_MAX)?SHRT_MAX:sd->battle_status.hp;
- WBUFW(buf,8)=(sd->battle_status.max_hp > SHRT_MAX)?SHRT_MAX:sd->battle_status.max_hp;
+ if (sd->battle_status.max_hp > SHRT_MAX) { //To correctly display the %hp bar. [Skotlex]
+ WBUFW(buf,6) = 10000*sd->battle_status.hp/sd->battle_status.max_hp;
+ WBUFW(buf,8) = 10000;
+ } else {
+ WBUFW(buf,6) = sd->battle_status.hp;
+ WBUFW(buf,8) = sd->battle_status.max_hp;
+ }
clif_send(buf,packet_len_table[0x106],&sd->bl,PARTY_AREA_WOS);
return 0;
}
@@ -5956,8 +5961,13 @@ static void clif_hpmeter_single(int fd, struct map_session_data *sd) WFIFOHEAD(fd,packet_len_table[0x106]);
WFIFOW(fd,0) = 0x106;
WFIFOL(fd,2) = sd->status.account_id;
- WFIFOW(fd,6) = (sd->battle_status.hp > SHRT_MAX) ? SHRT_MAX : sd->battle_status.hp;
- WFIFOW(fd,8) = (sd->battle_status.max_hp > SHRT_MAX) ? SHRT_MAX : sd->battle_status.max_hp;
+ if (sd->battle_status.max_hp > SHRT_MAX) { //To correctly display the %hp bar. [Skotlex]
+ WFIFOW(fd,6) = 10000*sd->battle_status.hp/sd->battle_status.max_hp;
+ WFIFOW(fd,8) = 10000;
+ } else {
+ WFIFOW(fd,6) = sd->battle_status.hp;
+ WFIFOW(fd,8) = sd->battle_status.max_hp;
+ }
WFIFOSET (fd, packet_len_table[0x106]);
}
@@ -5981,8 +5991,13 @@ int clif_hpmeter(struct map_session_data *sd) WBUFW(buf,0) = 0x106;
WBUFL(buf,2) = sd->status.account_id;
- WBUFW(buf,6) = (sd->battle_status.hp > SHRT_MAX) ? SHRT_MAX : sd->battle_status.hp;
- WBUFW(buf,8) = (sd->battle_status.max_hp > SHRT_MAX) ? SHRT_MAX : sd->battle_status.max_hp;
+ if (sd->battle_status.max_hp > SHRT_MAX) { //To correctly display the %hp bar. [Skotlex]
+ WBUFW(buf,6) = 10000*sd->battle_status.hp/sd->battle_status.max_hp;
+ WBUFW(buf,8) = 10000;
+ } else {
+ WBUFW(buf,6) = sd->battle_status.hp;
+ WBUFW(buf,8) = sd->battle_status.max_hp;
+ }
for (i = 0; i < fd_max; i++) {
if (session[i] && (sd2 = (struct map_session_data*)session[i]->session_data) && sd != sd2 && sd2->state.auth) {
if (sd2->bl.m != sd->bl.m ||
|