- Added sd variables menuskill_id/menuskill_lv to store menu-based selections. These are used now to check the validity of skill use instead of sd->skillid/sd->skilllv

- Affected skills/packets: AC_MAKINGARROW/ AL_WARP/ AL_TELEPORT/ AM_PHARMACY (all refine functions)/ MC_IDENTIFY/ BS_REPAIRWEAPON/ SA_TAMINGMONSTER/ SA_AUTOSPELL/ WS_WEAPONREFINE/ SG_FEEL
- Removed feel_lv and repair_target variables as now they are handled by the previous two new variables.


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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/map/clif.h b/src/map/clif.h
index 64bb102a2..3e99b641f 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -177,11 +177,11 @@ int clif_skill_nodamage(struct block_list *src,struct block_list *dst,
 int clif_skill_poseffect(struct block_list *src,int skill_id,

 	int val,int x,int y,int tick);

 int clif_skill_estimation(struct map_session_data *sd,struct block_list *dst);

-int clif_skill_warppoint(struct map_session_data *sd,int skill_num,

+int clif_skill_warppoint(struct map_session_data *sd,int skill_num, int skill_lv,

 	const char *map1,const char *map2,const char *map3,const char *map4);

 int clif_skill_memo(struct map_session_data *sd,int flag);

 int clif_skill_teleportmessage(struct map_session_data *sd,int flag);

-int clif_skill_produce_mix_list(struct map_session_data *sd,int trigger);

+int clif_skill_produce_mix_list(struct map_session_data *sd, int trigger);

 

 int clif_produceeffect(struct map_session_data *sd,int flag,int nameid);

 

@@ -334,7 +334,7 @@ int do_init_clif(void);
 

 

 int clif_party_xy_remove(struct map_session_data *sd); //Fix for minimap [Kevin]

-void clif_parse_ReqFeel(int fd, struct map_session_data *sd); 

+void clif_parse_ReqFeel(int fd, struct map_session_data *sd, int skilllv); 

 void clif_feel_info(struct map_session_data *sd, int feel_level);

 void clif_hate_mob(struct map_session_data *sd, int skilllv,int mob_id);

 void clif_mission_mob(struct map_session_data *sd, unsigned short mob_id, unsigned short progress);