summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorglighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-31 04:03:26 +0000
committerglighta <glighta@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-12-31 04:03:26 +0000
commitf2e6d012726b884d066094a045f74064326e89fa (patch)
treeb0e95cec40342987024997dbed4de36efa37a74d /src
parentf7a4bfbba6b5a247fcf76d5b10fdd80fd1a32e5e (diff)
downloadhercules-f2e6d012726b884d066094a045f74064326e89fa.tar.gz
hercules-f2e6d012726b884d066094a045f74064326e89fa.tar.bz2
hercules-f2e6d012726b884d066094a045f74064326e89fa.tar.xz
hercules-f2e6d012726b884d066094a045f74064326e89fa.zip
-Follow up r17065 fiw splash skill being broken.
-Also revert unintentional change of GDI_SKILLLV (even if useless enum) bugreport:7076 --All type change related to tid:75123 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17067 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/common/mmo.h2
-rw-r--r--src/map/elemental.c3
-rw-r--r--src/map/skill.c5
3 files changed, 6 insertions, 4 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 744108a31..cbdacdc0f 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -545,7 +545,7 @@ enum { //Change Guild Infos
GBI_EXP =1, // Guild Experience (EXP)
GBI_GUILDLV, // Guild level
GBI_SKILLPOINT, // Guild skillpoints
- GBI_skill_lv, // Guild skill_lv ?? seem unused
+ GBI_SKILLLV, // Guild skill_lv ?? seem unused
};
enum { //Change Member Infos
diff --git a/src/map/elemental.c b/src/map/elemental.c
index a787b1be4..90b90c1e3 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -853,7 +853,8 @@ int read_elemental_skilldb(void) {
char *str[4];
struct s_elemental_db *db;
int i, j = 0, k = 0, class_;
- uint16 skill_id, skill_lv, skillmode;
+ uint16 skill_id, skill_lv;
+ int skillmode;
sprintf(line, "%s/%s", db_path, "elemental_skill_db.txt");
fp = fopen(line, "r");
diff --git a/src/map/skill.c b/src/map/skill.c
index c5303578d..b9b05013c 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -197,7 +197,7 @@ int skill_get_ele( uint16 skill_id , uint16 skill_lv ) { skill_get (skill_d
int skill_get_nk( uint16 skill_id ) { skill_get (skill_db[skill_id].nk, skill_id, 1); }
int skill_get_max( uint16 skill_id ) { skill_get (skill_db[skill_id].max, skill_id, 1); }
int skill_get_range( uint16 skill_id , uint16 skill_lv ) { skill_get (skill_db[skill_id].range[skill_lv-1], skill_id, skill_lv); }
-int skill_get_splash( uint16 skill_id , uint16 skill_lv ) { skill_chk (&skill_id, skill_lv); return (skill_db[skill_id].splash[skill_lv-1]>=0?skill_db[skill_id].splash[skill_lv-1]:AREA_SIZE); }
+int skill_get_splash( uint16 skill_id , uint16 skill_lv ) { skill_get ( (skill_db[skill_id].splash[skill_lv-1]>=0?skill_db[skill_id].splash[skill_lv-1]:AREA_SIZE), skill_id, skill_lv); }
int skill_get_hp( uint16 skill_id ,uint16 skill_lv ) { skill_get (skill_db[skill_id].hp[skill_lv-1], skill_id, skill_lv); }
int skill_get_sp( uint16 skill_id ,uint16 skill_lv ) { skill_get (skill_db[skill_id].sp[skill_lv-1], skill_id, skill_lv); }
int skill_get_hp_rate(uint16 skill_id, uint16 skill_lv ) { skill_get (skill_db[skill_id].hp_rate[skill_lv-1], skill_id, skill_lv); }
@@ -2814,7 +2814,8 @@ typedef int (*SkillFunc)(struct block_list *, struct block_list *, int, int, uns
int skill_area_sub (struct block_list *bl, va_list ap)
{
struct block_list *src;
- uint16 skill_id,skill_lv,flag;
+ uint16 skill_id,skill_lv;
+ int flag;
unsigned int tick;
SkillFunc func;