summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-05-23 15:57:59 -0500
committerWushin <pasekei@gmail.com>2015-05-23 15:57:59 -0500
commite11bd75f66a2fdfaa1e764be8773cf1bea91190e (patch)
tree6bfb1884584e63c76b9dff9c3eebc1ddbd6734cf
parentbf8c3eb1475a041e31cb2f19a24f8a08a5633b32 (diff)
parentdbfde2c5fbd23efe21b611440ddac7c5eb1aff4f (diff)
downloadtmwa-e11bd75f66a2fdfaa1e764be8773cf1bea91190e.tar.gz
tmwa-e11bd75f66a2fdfaa1e764be8773cf1bea91190e.tar.bz2
tmwa-e11bd75f66a2fdfaa1e764be8773cf1bea91190e.tar.xz
tmwa-e11bd75f66a2fdfaa1e764be8773cf1bea91190e.zip
Merge pull request #97 from mekolat/mobhp
invert mob hp
-rw-r--r--src/map/clif.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/clif.cpp b/src/map/clif.cpp
index bae0bf1..248f74a 100644
--- a/src/map/clif.cpp
+++ b/src/map/clif.cpp
@@ -787,10 +787,10 @@ void clif_mob0078(dumb_ptr<mob_data> md, Buffer& buf)
fixed_78.pos.y = md->bl_y;
fixed_78.pos.dir = md->dir;
- fixed_78.gloves_or_part_of_hp = static_cast<short>(hp >> 16);
- fixed_78.part_of_guild_id_or_part_of_hp = static_cast<short>(hp & 0xffff);
- fixed_78.part_of_guild_id_or_part_of_max_hp = static_cast<short>(max_hp >> 16);
- fixed_78.guild_emblem_or_part_of_max_hp = static_cast<short>(max_hp & 0xffff);
+ fixed_78.gloves_or_part_of_hp = static_cast<short>(hp & 0xffff);
+ fixed_78.part_of_guild_id_or_part_of_hp = static_cast<short>(hp >> 16);
+ fixed_78.part_of_guild_id_or_part_of_max_hp = static_cast<short>(max_hp & 0xffff);
+ fixed_78.guild_emblem_or_part_of_max_hp = static_cast<short>(max_hp >> 16);
fixed_78.karma_or_attack_range = battle_get_range(md);
buf = create_fpacket<0x0078, 54>(fixed_78);
@@ -822,10 +822,10 @@ void clif_mob007b(dumb_ptr<mob_data> md, Buffer& buf)
fixed_7b.pos2.x1 = md->to_x;
fixed_7b.pos2.y1 = md->to_y;
- fixed_7b.gloves_or_part_of_hp = static_cast<short>(hp >> 16);
- fixed_7b.part_of_guild_id_or_part_of_hp = static_cast<short>(hp & 0xffff);
- fixed_7b.part_of_guild_id_or_part_of_max_hp = static_cast<short>(max_hp >> 16);
- fixed_7b.guild_emblem_or_part_of_max_hp = static_cast<short>(max_hp & 0xffff);
+ fixed_7b.gloves_or_part_of_hp = static_cast<short>(hp & 0xffff);
+ fixed_7b.part_of_guild_id_or_part_of_hp = static_cast<short>(hp >> 16);
+ fixed_7b.part_of_guild_id_or_part_of_max_hp = static_cast<short>(max_hp & 0xffff);
+ fixed_7b.guild_emblem_or_part_of_max_hp = static_cast<short>(max_hp >> 16);
fixed_7b.karma_or_attack_range = battle_get_range(md);
buf = create_fpacket<0x007b, 60>(fixed_7b);