summaryrefslogtreecommitdiff
path: root/src/map/clif.h
diff options
context:
space:
mode:
authorj-tkay <joseph.tk.ea@gmail.com>2013-07-04 05:17:17 +0800
committerj-tkay <joseph.tk.ea@gmail.com>2013-07-04 05:17:17 +0800
commitca0205134beb9ba26e989c9fc3820c086d4d22a7 (patch)
tree6790ece04272e548a46ee2255364b026def3fd6e /src/map/clif.h
parent28a9fec0916db3d92629ae6e6cd62b5777b09e73 (diff)
parentd88be27960c4508c2f61a729fb5e4c89965b7e0b (diff)
downloadhercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.gz
hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.bz2
hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.tar.xz
hercules-ca0205134beb9ba26e989c9fc3820c086d4d22a7.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 bea701223..a0946a48a 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -38,12 +38,13 @@ struct quest;
struct party_booking_ad_info;
struct view_data;
struct eri;
+struct skill_cd;
/**
* Defines
**/
#define packet_len(cmd) packet_db[cmd].len
-#define P2PTR(fd,cmd) RFIFO2PTR(fd,packet_db[cmd].len)
+#define P2PTR(fd) RFIFO2PTR(fd)
#define clif_menuskill_clear(sd) (sd)->menuskill_id = (sd)->menuskill_val = (sd)->menuskill_val2 = 0;
#define HCHSYS_NAME_LENGTH 20
@@ -632,6 +633,7 @@ struct clif_interface {
void (*sc_load) (struct block_list *bl, int tid, enum send_target target, int type, int val1, int val2, int val3);
void (*sc_end) (struct block_list *bl, int tid, enum send_target target, int type);
void (*initialstatus) (struct map_session_data *sd);
+ void (*cooldown_list) (int fd, struct skill_cd* cd);
/* player-unit-specific-related */
void (*updatestatus) (struct map_session_data *sd,int type);
void (*changestatus) (struct map_session_data* sd,int type,int val);
@@ -1147,7 +1149,7 @@ struct clif_interface {
void (*pPartyBookingRefuseVolunteer) (int fd, struct map_session_data *sd);
void (*pPartyBookingCancelVolunteer) (int fd, struct map_session_data *sd);
#endif
-} clif_s;
+};
struct clif_interface *clif;