From 41951f3f6be59e77117a5332c3be6cca92cedf90 Mon Sep 17 00:00:00 2001 From: ultramage Date: Mon, 1 Oct 2007 14:55:35 +0000 Subject: * Fixed various trading/vending glitches - fixed vending_tax not working at all (integer division in r10182) - undid change from r8273 where pc_getzeny() treated zeny overflow as an error condition; officially, the value is just bounded to MAX_ZENY - fixed stupid code that, instead of properly checking and filtering invalid items during shop setup, opted to 'hide' these items from the vending list instead... - removed some custom error message packets related to vending - fixed a glitch where the server would open a shop with no items when all entered items were tagged as invalid - split zeny handling from trade_tradeadditem() into a separate func (trade_tradeaddzeny()) - removed loads of redundant code from vending.c git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11344 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/map/clif.h') diff --git a/src/map/clif.h b/src/map/clif.h index 79f69c87d..0e0667503 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -19,7 +19,7 @@ struct npc_data; struct chat_data; struct flooritem_data; struct skill_unit; -struct vending; +struct s_vending; struct party; struct party_data; struct guild; @@ -166,13 +166,13 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd); void clif_hotkeys_send(struct map_session_data *sd); // trade -int clif_traderequest(struct map_session_data* sd, const char* name); -int clif_tradestart(struct map_session_data *sd,int type); -int clif_tradeadditem(struct map_session_data *sd,struct map_session_data *tsd,int index,int amount); -int clif_tradeitemok(struct map_session_data *sd,int index,int fail); -int clif_tradedeal_lock(struct map_session_data *sd,int fail); -int clif_tradecancelled(struct map_session_data *sd); -int clif_tradecompleted(struct map_session_data *sd,int fail); +void clif_traderequest(struct map_session_data* sd, const char* name); +void clif_tradestart(struct map_session_data* sd, int type); +void clif_tradeadditem(struct map_session_data* sd, struct map_session_data* tsd, int index, int amount); +void clif_tradeitemok(struct map_session_data* sd, int index, int fail); +void clif_tradedeal_lock(struct map_session_data* sd, int fail); +void clif_tradecancelled(struct map_session_data* sd); +void clif_tradecompleted(struct map_session_data* sd, int fail); // storage #include "storage.h" @@ -266,13 +266,13 @@ int clif_mvp_exp(struct map_session_data *sd,unsigned long exp); void clif_changed_dir(struct block_list *bl, int area); // vending -int clif_openvendingreq(struct map_session_data *sd,int num); -int clif_showvendingboard(struct block_list* bl, const char* message, int fd); -int clif_closevendingboard(struct block_list* bl,int fd); -int clif_vendinglist(struct map_session_data *sd,int id,struct vending *vending); -int clif_buyvending(struct map_session_data *sd,int index,int amount,int fail); -int clif_openvending(struct map_session_data *sd,int id,struct vending *vending); -int clif_vendingreport(struct map_session_data *sd,int index,int amount); +void clif_openvendingreq(struct map_session_data* sd, int num); +void clif_showvendingboard(struct block_list* bl, const char* message, int fd); +void clif_closevendingboard(struct block_list* bl,int fd); +void clif_vendinglist(struct map_session_data* sd,int id, struct s_vending* vending); +void clif_buyvending(struct map_session_data* sd, int index, int amount, int fail); +void clif_openvending(struct map_session_data* sd, int id, struct s_vending* vending); +void clif_vendingreport(struct map_session_data* sd, int index, int amount); int clif_movetoattack(struct map_session_data *sd,struct block_list *bl); -- cgit v1.2.3-60-g2f50