summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-10-31 02:24:34 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-10-31 02:24:34 +0000
commit3ce90667d6a307bb09abad0f68412f0ab34d46e3 (patch)
tree00ed323b8da0390aef4945f8cc348c1e0d46314f /src
parentb6bb5fff4429f8f7f318f34595920b58d8d42ea8 (diff)
downloadhercules-3ce90667d6a307bb09abad0f68412f0ab34d46e3.tar.gz
hercules-3ce90667d6a307bb09abad0f68412f0ab34d46e3.tar.bz2
hercules-3ce90667d6a307bb09abad0f68412f0ab34d46e3.tar.xz
hercules-3ce90667d6a307bb09abad0f68412f0ab34d46e3.zip
bugreport:6830 / follow up r16848, dropped flag param in skill_select_menu as we do not rely on it.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16849 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c5
-rw-r--r--src/map/skill.c2
-rw-r--r--src/map/skill.h2
3 files changed, 6 insertions, 3 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 38d62691f..07e2591c5 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -16136,6 +16136,7 @@ void clif_msgtable_num(int fd, int line, int num) {
}
/*==========================================
* used by SC_AUTOSHADOWSPELL
+ * RFIFOL(fd,2) - flag (currently not used)
*------------------------------------------*/
void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) {
@@ -16147,7 +16148,9 @@ void clif_parse_SkillSelectMenu(int fd, struct map_session_data *sd) {
clif_menuskill_clear(sd);
return;
}
- skill_select_menu(sd,RFIFOL(fd,2),RFIFOW(fd,6));
+
+ skill_select_menu(sd,RFIFOW(fd,6));
+
clif_menuskill_clear(sd);
}
/*==========================================
diff --git a/src/map/skill.c b/src/map/skill.c
index df3d30765..9cf53688c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -16331,7 +16331,7 @@ int skill_spellbook (struct map_session_data *sd, int nameid) {
return 1;
}
-int skill_select_menu(struct map_session_data *sd,int flag,int skill_id) {
+int skill_select_menu(struct map_session_data *sd,int skill_id) {
int id, lv, prob, aslvl = 0;
nullpo_ret(sd);
diff --git a/src/map/skill.h b/src/map/skill.h
index effb6164b..5250af1f6 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -1850,7 +1850,7 @@ enum gx_poison {
/**
* Auto Shadow Spell (Shadow Chaser)
**/
-int skill_select_menu(struct map_session_data *sd,int flag,int skill_id);
+int skill_select_menu(struct map_session_data *sd,int skill_id);
int skill_elementalanalysis(struct map_session_data *sd, int n, int type, unsigned short *item_list); // Sorcerer Four Elemental Analisys.
int skill_changematerial(struct map_session_data *sd, int n, unsigned short *item_list); // Genetic Change Material.