- Fixed npc_checknear's distance check returning the opposite of what it should (false when the range is correct and viceversa)

- SL_STIN/SL_STUN have dex-reducable casting times now.
- Added a warning on item loading when an item is of equippable type but has no equippable position.
- Turning an alliance to an opposition won't work now during WoE
- Slaves can summon other mobs now. The only ones who can't do this are player summoned mobs.
- Merged the following functions for faster processing of items:
  clif_storageitemlist + clif_storageequiplist = clif_storagelist
  clif_guildstorageitemlist + clif_guildstorageequiplist = clif_guildstoragelist
  clif_itemlist + clif_equiplist = clif_inventorylist
- Increased max knockback value support to 25.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7109 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 5 insertions, 8 deletions

diff --git a/src/map/clif.h b/src/map/clif.h
index a50f8ec18..951f25065 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -155,14 +155,12 @@ int clif_tradecompleted(struct map_session_data *sd,int fail);
 

 // storage

 #include "storage.h"

-int clif_storageitemlist(struct map_session_data *sd,struct storage *stor);

-int clif_storageequiplist(struct map_session_data *sd,struct storage *stor);

+void clif_storagelist(struct map_session_data *sd,struct storage *stor);

 int clif_updatestorageamount(struct map_session_data *sd,struct storage *stor);

 int clif_storageitemadded(struct map_session_data *sd,struct storage *stor,int index,int amount);

 int clif_storageitemremoved(struct map_session_data *sd,int index,int amount);

 int clif_storageclose(struct map_session_data *sd);

-int clif_guildstorageitemlist(struct map_session_data *sd,struct guild_storage *stor);

-int clif_guildstorageequiplist(struct map_session_data *sd,struct guild_storage *stor);

+void clif_guildstoragelist(struct map_session_data *sd,struct guild_storage *stor);

 int clif_updateguildstorageamount(struct map_session_data *sd,struct guild_storage *stor);

 int clif_guildstorageitemadded(struct map_session_data *sd,struct guild_storage *stor,int index,int amount);

 

@@ -226,13 +224,12 @@ int clif_charnameupdate(struct map_session_data *ssd);
 int clif_use_card(struct map_session_data *sd,int idx);

 int clif_insert_card(struct map_session_data *sd,int idx_equip,int idx_card,int flag);

 

-int clif_itemlist(struct map_session_data *sd);

-int clif_equiplist(struct map_session_data *sd);

+void clif_inventorylist(struct map_session_data *sd);

+void clif_equiplist(struct map_session_data *sd);

 

 int clif_cart_additem(struct map_session_data*,int,int,int);

 int clif_cart_delitem(struct map_session_data*,int,int);

-int clif_cart_itemlist(struct map_session_data *sd);

-int clif_cart_equiplist(struct map_session_data *sd);

+void clif_cartlist(struct map_session_data *sd);

 

 int clif_item_identify_list(struct map_session_data *sd);

 int clif_item_identified(struct map_session_data *sd,int idx,int flag);