summaryrefslogtreecommitdiff
path: root/src/map/clif.h
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-17 06:44:35 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-17 06:44:35 +0000
commitb965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea (patch)
treee7ff5ed861ac7c6d660527d172b1731095d88128 /src/map/clif.h
parent98add4b57c4f0d4fdf21ec34ebfd3ea05c640fbf (diff)
downloadhercules-b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea.tar.gz
hercules-b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea.tar.bz2
hercules-b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea.tar.xz
hercules-b965f8dd85d0b0ea5e3fb512fc7b81d5b0a5eeea.zip
* Merged changes up to eAthena 15057.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15475 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.h')
-rw-r--r--src/map/clif.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/map/clif.h b/src/map/clif.h
index 29e870185..039a66116 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -396,11 +396,10 @@ void clif_tradecompleted(struct map_session_data* sd, int fail);
// storage
void clif_storagelist(struct map_session_data* sd, struct item* items, int items_length);
-void clif_updatestorageamount(struct map_session_data* sd, int amount);
+void clif_updatestorageamount(struct map_session_data* sd, int amount, int max_amount);
void clif_storageitemadded(struct map_session_data* sd, struct item* i, int index, int amount);
void clif_storageitemremoved(struct map_session_data* sd, int index, int amount);
void clif_storageclose(struct map_session_data* sd);
-void clif_updateguildstorageamount(struct map_session_data* sd, int amount);
int clif_insight(struct block_list *bl,va_list ap); // map_forallinmovearea callback
int clif_outsight(struct block_list *bl,va_list ap); // map_forallinmovearea callback
@@ -536,9 +535,9 @@ void clif_guild_xy_single(int fd, struct map_session_data *sd);
void clif_guild_xy_remove(struct map_session_data *sd);
// Battleground
-int clif_bg_hp(struct map_session_data *sd);
-int clif_bg_xy(struct map_session_data *sd);
-int clif_bg_xy_remove(struct map_session_data *sd);
+void clif_bg_hp(struct map_session_data *sd);
+void clif_bg_xy(struct map_session_data *sd);
+void clif_bg_xy_remove(struct map_session_data *sd);
void clif_bg_message(struct battleground_data *bg, int src_id, const char *name, const char *mes, int len);
void clif_bg_updatescore(int m);
void clif_bg_updatescore_single(struct map_session_data *sd);