diff options
| author | Haru <haru@dotalux.com> | 2016-12-03 03:41:08 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2017-09-17 17:48:15 +0200 |
| commit | a681d759cc887e8adccbd30d3b7a7ca355bbda96 (patch) | |
| tree | cdea2ed4340cd81f31d05e34772ad0d2cf7ffd57 /src/map/clif.c | |
| parent | 9a7536d2e092d9a7737e795094e68e6d1f94f6e9 (diff) | |
| download | hercules-a681d759cc887e8adccbd30d3b7a7ca355bbda96.tar.gz hercules-a681d759cc887e8adccbd30d3b7a7ca355bbda96.tar.bz2 hercules-a681d759cc887e8adccbd30d3b7a7ca355bbda96.tar.xz hercules-a681d759cc887e8adccbd30d3b7a7ca355bbda96.zip | |
Differentiate variables that hold a ViewSprite and a weapon Subtype
`sd->status.weapon` is renamed to `sd->status.look.weapon` and only
holds ViewSprite IDs. Its previous other meaning is now transferred to
`sd->weapontype` (holding the currently equipped weapon type,
considering both hands at once)
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 3599640b9..2962aaa8b 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -888,7 +888,7 @@ void clif_get_weapon_view(struct map_session_data* sd, unsigned short *rhand, un } #if PACKETVER < 4 - *rhand = sd->status.weapon; + *rhand = sd->status.look.weapon; *lhand = sd->status.shield; #else if (sd->equip_index[EQI_HAND_R] >= 0 && @@ -9449,7 +9449,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.weapon); + clif->changelook(&sd->bl, LOOK_WEAPON, sd->status.look.weapon); clif->changelook(&sd->bl,LOOK_SHIELD,sd->status.shield); #else clif->changelook(&sd->bl,LOOK_WEAPON,0); |