diff options
| author | Haru <haru@dotalux.com> | 2017-09-19 00:55:36 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2017-09-19 00:57:24 +0200 |
| commit | fbc66fa0982a9d7a4ae03377b2eb2b3cfa30c90c (patch) | |
| tree | 23cb25b210b28da7d083de1079a846d800a601b3 | |
| parent | f4a58bbf20e1a46420df0ea9264876217b150a66 (diff) | |
| download | hercules-fbc66fa0982a9d7a4ae03377b2eb2b3cfa30c90c.tar.gz hercules-fbc66fa0982a9d7a4ae03377b2eb2b3cfa30c90c.tar.bz2 hercules-fbc66fa0982a9d7a4ae03377b2eb2b3cfa30c90c.tar.xz hercules-fbc66fa0982a9d7a4ae03377b2eb2b3cfa30c90c.zip | |
Fix compile errors with some specific PACKETVER values
- PACKETVER <= 3
- PACKETVER == 20071106
- PACKETVER >= 20141016 && PACKETVER <= 20141022
- PACKETVER >= 20160921
Signed-off-by: Haru <haru@dotalux.com>
| -rw-r--r-- | src/map/clif.c | 8 | ||||
| -rw-r--r-- | src/map/packets_struct.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 07f394da4..3c93bae57 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -679,7 +679,7 @@ void clif_authok(struct map_session_data *sd) p.font = sd->status.font; #endif // Some clients smaller than 20160330 cant be tested [4144] -#if PACKETVER >= 20141016 && PACKETVER < 20160330 +#if PACKETVER >= 20141022 && PACKETVER < 20160330 p.sex = sd->status.sex; #endif clif->send(&p,sizeof(p),&sd->bl,SELF); @@ -2488,7 +2488,7 @@ void clif_additem(struct map_session_data *sd, int n, int amount, int fail) #endif #if PACKETVER >= 20160921 p.favorite = sd->status.inventory[n].favorite; - p.look = sd->inventory_data[n]->look; + p.look = sd->inventory_data[n]->view_sprite; #endif } p.result = (unsigned char)fail; @@ -3183,7 +3183,9 @@ void clif_changelook(struct block_list *bl,int type,int val) struct status_change* sc; struct view_data* vd; enum send_target target = AREA; +#if PACKETVER >= 4 int val2 = 0; +#endif nullpo_retv(bl); sd = BL_CAST(BL_PC, bl); @@ -6402,7 +6404,7 @@ void clif_vendinglist(struct map_session_data* sd, unsigned int id, struct s_ven // [4144] date 20160921 not confirmend. Can be bigger or smaller #if PACKETVER >= 20160921 WFIFOL(fd, offset + 47 + i * item_length) = pc->item_equippoint(sd, data); - WFIFOW(fd, offset + 51 + i * item_length) = data->look; + WFIFOW(fd, offset + 51 + i * item_length) = data->view_sprite; #endif } WFIFOSET(fd,WFIFOW(fd,2)); diff --git a/src/map/packets_struct.h b/src/map/packets_struct.h index 6e0ddf814..207c345da 100644 --- a/src/map/packets_struct.h +++ b/src/map/packets_struct.h @@ -632,7 +632,7 @@ struct packet_unit_walking { #if PACKETVER >= 20091103 int16 PacketLength; #endif -#if PACKETVER > 20071106 +#if PACKETVER >= 20071106 uint8 objecttype; #endif #if PACKETVER >= 20131223 |