summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhemagx <hemagx2@gmail.com>2016-06-23 23:56:47 +0200
committerhemagx <hemagx2@gmail.com>2016-06-23 23:56:47 +0200
commit2c5dcfe93a100d570d32ef5ff91c3336ec9d4e05 (patch)
tree08981821ffb532b3571808e393359a8bf4fc8e17
parentbfc3585388a075a04476f0b7f31be4e19953936e (diff)
downloadhercules-2c5dcfe93a100d570d32ef5ff91c3336ec9d4e05.tar.gz
hercules-2c5dcfe93a100d570d32ef5ff91c3336ec9d4e05.tar.bz2
hercules-2c5dcfe93a100d570d32ef5ff91c3336ec9d4e05.tar.xz
hercules-2c5dcfe93a100d570d32ef5ff91c3336ec9d4e05.zip
Interface clif_bl_type now it's clif->bl_type
-rw-r--r--src/map/clif.c13
-rw-r--r--src/map/clif.h1
2 files changed, 8 insertions, 6 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index aff21c263..40545cd6d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -266,7 +266,7 @@ uint32 clif_refresh_ip(void)
}
#if PACKETVER >= 20071106
-static inline unsigned char clif_bl_type(struct block_list *bl) {
+unsigned char clif_bl_type(struct block_list *bl) {
struct view_data *vd;
nullpo_retr(CLUT_NPC, bl);
@@ -946,7 +946,7 @@ void clif_set_unit_idle2(struct block_list* bl, struct map_session_data *tsd, en
p.PacketType = idle_unit2Type;
#if PACKETVER >= 20071106
- p.objecttype = clif_bl_type(bl);
+ p.objecttype = clif->bl_type(bl);
#endif
p.GID = bl->id;
p.speed = status->get_speed(bl);
@@ -1008,7 +1008,7 @@ void clif_set_unit_idle(struct block_list* bl, struct map_session_data *tsd, enu
p.PacketType = idle_unitType;
#if PACKETVER >= 20091103
p.PacketLength = sizeof(p);
- p.objecttype = clif_bl_type(bl);
+ p.objecttype = clif->bl_type(bl);
#endif
#if PACKETVER >= 20131223
p.AID = bl->id;
@@ -1097,7 +1097,7 @@ void clif_spawn_unit2(struct block_list* bl, enum send_target target) {
p.PacketType = spawn_unit2Type;
#if PACKETVER >= 20071106
- p.objecttype = clif_bl_type(bl);
+ p.objecttype = clif->bl_type(bl);
#endif
p.GID = bl->id;
p.speed = status->get_speed(bl);
@@ -1150,7 +1150,7 @@ void clif_spawn_unit(struct block_list* bl, enum send_target target) {
p.PacketType = spawn_unitType;
#if PACKETVER >= 20091103
p.PacketLength = sizeof(p);
- p.objecttype = clif_bl_type(bl);
+ p.objecttype = clif->bl_type(bl);
#endif
#if PACKETVER >= 20131223
p.AID = bl->id;
@@ -1246,7 +1246,7 @@ void clif_set_unit_walking(struct block_list* bl, struct map_session_data *tsd,
p.PacketLength = sizeof(p);
#endif
#if PACKETVER >= 20071106
- p.objecttype = clif_bl_type(bl);
+ p.objecttype = clif->bl_type(bl);
#endif
#if PACKETVER >= 20131223
p.AID = bl->id;
@@ -19618,6 +19618,7 @@ void clif_defaults(void) {
clif->selectcart = clif_selectcart;
/* */
clif->isdisguised = clif_isdisguised;
+ clif->bl_type = clif_bl_type;
/*------------------------
*- Parse Incoming Packet
diff --git a/src/map/clif.h b/src/map/clif.h
index 26cb7fa3f..da0f2e21d 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -1110,6 +1110,7 @@ struct clif_interface {
void (*ackmergeitems) (int fd, struct map_session_data *sd);
/* */
bool (*isdisguised) (struct block_list* bl);
+ unsigned char (*bl_type) (struct block_list *bl);
/*------------------------
*- Parse Incoming Packet
*------------------------*/