diff options
| author | Haru <haru@dotalux.com> | 2016-12-03 06:19:35 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2017-09-17 17:48:16 +0200 |
| commit | 20caa41aeae6e49375aeb187c06dc077e330b414 (patch) | |
| tree | 9e96d78a78005c979e8204da8dd806fc706c6ceb /src/map/clif.c | |
| parent | a681d759cc887e8adccbd30d3b7a7ca355bbda96 (diff) | |
| download | hercules-20caa41aeae6e49375aeb187c06dc077e330b414.tar.gz hercules-20caa41aeae6e49375aeb187c06dc077e330b414.tar.bz2 hercules-20caa41aeae6e49375aeb187c06dc077e330b414.tar.xz hercules-20caa41aeae6e49375aeb187c06dc077e330b414.zip | |
Differentiate variables that hold a ViewSprite and a Subtype (part 2)
`sd->status.shield` is renamed to `sd->status.look.shield` and only
holds ViewSprite IDs. Its previous other meaning is now transferred to
`sd->has_shield`, of boolean type (to detect the presence of a shield)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/clif.c')
| -rw-r--r-- | src/map/clif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 2962aaa8b..77e6d6055 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -889,7 +889,7 @@ void clif_get_weapon_view(struct map_session_data* sd, unsigned short *rhand, un #if PACKETVER < 4 *rhand = sd->status.look.weapon; - *lhand = sd->status.shield; + *lhand = sd->status.look.shield; #else if (sd->equip_index[EQI_HAND_R] >= 0 && sd->inventory_data[sd->equip_index[EQI_HAND_R]]) @@ -9450,7 +9450,7 @@ void clif_parse_LoadEndAck(int fd, struct map_session_data *sd) { // Character Looks #if PACKETVER < 4 clif->changelook(&sd->bl, LOOK_WEAPON, sd->status.look.weapon); - clif->changelook(&sd->bl,LOOK_SHIELD,sd->status.shield); + clif->changelook(&sd->bl, LOOK_SHIELD, sd->status.look.shield); #else clif->changelook(&sd->bl,LOOK_WEAPON,0); #endif |