Skip to content

Fix Weapon and Shield Sprite #3380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MrKeiKun wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −24
Draft

Fix Weapon and Shield Sprite #3380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/map/clif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,9 +1142,7 @@ static void clif_set_unit_idle(struct block_list *bl, struct map_session_data *t
p.head = vd->hair_style;
p.weapon = vd->weapon;
p.accessory = vd->head_bottom;
#if PACKETVER < 7 || PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
p.shield = vd->shield;
#endif
p.accessory2 = vd->head_top;
p.accessory3 = vd->head_mid;
if (bl->type == BL_NPC && vd->class == FLAG_CLASS) {
Expand Down Expand Up @@ -1301,9 +1299,7 @@ static void clif_spawn_unit(struct block_list *bl, enum send_target target)
p.head = vd->hair_style;
p.weapon = vd->weapon;
p.accessory = vd->head_bottom;
#if PACKETVER < 7 || PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
p.shield = vd->shield;
#endif
p.accessory2 = vd->head_top;
p.accessory3 = vd->head_mid;
if (bl->type == BL_NPC && vd->class == FLAG_CLASS) {
Expand Down Expand Up @@ -1411,9 +1407,7 @@ static void clif_set_unit_walking(struct block_list *bl, struct map_session_data
p.weapon = vd->weapon;
p.accessory = vd->head_bottom;
p.moveStartTime = (unsigned int)timer->gettick();
#if PACKETVER < 7 || PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
p.shield = vd->shield;
#endif
p.accessory2 = vd->head_top;
p.accessory3 = vd->head_mid;
p.headpalette = vd->hair_color;
Expand Down
33 changes: 15 additions & 18 deletions src/map/packets_struct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,18 +727,17 @@ struct packet_spawn_unit {
#endif
int16 job;
uint16 head;
#if PACKETVER < 7
uint16 weapon;
#else
#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
uint32 weapon;
#else
uint16 weapon;
#endif
#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
uint32 shield;
#endif
uint16 accessory;
#if PACKETVER < 7
#else
uint16 shield;
#endif
uint16 accessory;
uint16 accessory2;
uint16 accessory3;
int16 headpalette;
Expand Down Expand Up @@ -800,19 +799,18 @@ struct packet_unit_walking {
#endif
int16 job;
uint16 head;
#if PACKETVER < 7
uint16 weapon;
#else
#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
uint32 weapon;
#else
uint16 weapon;
#endif
#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
uint32 shield;
#else
uint16 shield;
#endif
uint16 accessory;
uint32 moveStartTime;
#if PACKETVER < 7
uint16 shield;
#endif
uint16 accessory2;
uint16 accessory3;
int16 headpalette;
Expand Down Expand Up @@ -872,18 +870,17 @@ struct packet_idle_unit {
#endif
int16 job;
uint16 head;
#if PACKETVER < 7
uint16 weapon;
#else
#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
uint32 weapon;
#else
uint16 weapon;
#endif
#if PACKETVER_MAIN_NUM >= 20181121 || PACKETVER_RE_NUM >= 20180704 || PACKETVER_ZERO_NUM >= 20181114
uint32 shield;
#endif
uint16 accessory;
#if PACKETVER < 7
#else
uint16 shield;
#endif
uint16 accessory;
uint16 accessory2;
uint16 accessory3;
int16 headpalette;
Expand Down
Loading