summaryrefslogtreecommitdiff
path: root/src/map/clif.h
diff options
context:
space:
mode:
authormalufett <malufett.eat.my.binaries@gmail.com>2013-07-21 21:07:49 +0800
committermalufett <malufett.eat.my.binaries@gmail.com>2013-07-21 21:07:49 +0800
commit760faf643731de9d38623dce4d129375801f8b33 (patch)
tree12a748aa89937f240f9c8eba472e58501f94008f /src/map/clif.h
parent8b00d9bd079514a1c307ef5d2e6614055e8f874e (diff)
parentfe946e819d935ca92208e32b6b2766ec92b30601 (diff)
downloadhercules-760faf643731de9d38623dce4d129375801f8b33.tar.gz
hercules-760faf643731de9d38623dce4d129375801f8b33.tar.bz2
hercules-760faf643731de9d38623dce4d129375801f8b33.tar.xz
hercules-760faf643731de9d38623dce4d129375801f8b33.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/clif.h')
-rw-r--r--src/map/clif.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/map/clif.h b/src/map/clif.h
index a0946a48a..2cf193965 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -501,6 +501,7 @@ struct clif_interface {
void (*addcards2) (unsigned short *cards, struct item* item);
void (*item_sub) (unsigned char *buf, int n, struct item *i, struct item_data *id, int equip);
void (*getareachar_item) (struct map_session_data* sd,struct flooritem_data* fitem);
+ void (*cart_additem_ack) (struct map_session_data *sd, int flag);
void (*cashshop_load) (void);
void (*package_announce) (struct map_session_data *sd, unsigned short nameid, unsigned short containerid);
/* unit-related */
@@ -917,6 +918,9 @@ struct clif_interface {
void (*notify_time) (struct map_session_data* sd, unsigned long time);
void (*user_count) (struct map_session_data* sd, int count);
void (*noask_sub) (struct map_session_data *src, struct map_session_data *target, int type);
+ void (*bc_ready) (void);
+ int (*undisguise_timer) (int tid, unsigned int tick, int id, intptr_t data);
+ /* Hercules Channel System */
void (*chsys_create) (struct hChSysCh *channel, char *name, char *pass, unsigned char color);
void (*chsys_msg) (struct hChSysCh *channel, struct map_session_data *sd, char *msg);
void (*chsys_msg2) (struct hChSysCh *channel, char *msg);
@@ -929,8 +933,6 @@ struct clif_interface {
void (*chsys_quitg) (struct map_session_data *sd);
void (*chsys_gjoin) (struct guild *g1,struct guild *g2);
void (*chsys_gleave) (struct guild *g1,struct guild *g2);
- void (*bc_ready) (void);
- int (*undisguise_timer) (int tid, unsigned int tick, int id, intptr_t data);
/*------------------------
*- Parse Incoming Packet
*------------------------*/