summaryrefslogtreecommitdiff
path: root/src/map/skill.c
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-28 18:47:21 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-28 18:47:21 +0000
commit35f85d72e7f191077ec510adbfc3943c9e24e226 (patch)
tree364610f443a8062f7606b7471cdee4f1a53a61c5 /src/map/skill.c
parent2af60a5e2080bf4e6452a96893de2c7878f8f394 (diff)
downloadhercules-35f85d72e7f191077ec510adbfc3943c9e24e226.tar.gz
hercules-35f85d72e7f191077ec510adbfc3943c9e24e226.tar.bz2
hercules-35f85d72e7f191077ec510adbfc3943c9e24e226.tar.xz
hercules-35f85d72e7f191077ec510adbfc3943c9e24e226.zip
Change
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@841 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
-rw-r--r--src/map/skill.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/map/skill.c b/src/map/skill.c
index b72edd325..af8db17cc 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -774,72 +774,89 @@ int skill_get_range( int id , int lv ){
}
int skill_get_hp( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0: skill_db[id].hp[lv-1];
}
int skill_get_sp( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
//if (lv <= 0) return 0;
//return (id < 500) ? skill_db[id].sp[lv-1] : guild_skill_get_sp(id, lv);
return (lv <= 0) ? 0: skill_db[id].sp[lv-1];
}
int skill_get_zeny( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].zeny[lv-1];
}
int skill_get_num( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].num[lv-1];
}
int skill_get_cast( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].cast[lv-1];
}
int skill_get_delay( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].delay[lv-1];
}
int skill_get_time( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].upkeep_time[lv-1];
}
int skill_get_time2( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].upkeep_time2[lv-1];
}
int skill_get_castdef( int id ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return skill_db[id].cast_def_rate;
}
int skill_get_weapontype( int id ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return skill_db[id].weapon;
}
int skill_get_inf2( int id ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return skill_db[id].inf2;
}
int skill_get_castcancel( int id ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return skill_db[id].castcancel;
}
int skill_get_maxcount( int id ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return skill_db[id].maxcount;
}
int skill_get_blewcount( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].blewcount[lv-1];
}
int skill_get_mhp( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].mhp[lv-1];
}
int skill_get_castnodex( int id ,int lv ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return (lv <= 0) ? 0:skill_db[id].castnodex[lv-1];
}
int skill_get_nocast ( int id ){
if (id >= 10000 && id < 10015) id-= 9500;
+ if ((id > MAX_SKILL) || (id < 0)) return 0;
return skill_db[id].nocast;
}
int skill_tree_get_max(int id, int b_class){
@@ -867,6 +884,11 @@ int skill_count_target(struct block_list *bl, va_list ap );
int skillnotok(int skillid, struct map_session_data *sd) {
if (sd == 0)
return 0;
+
+ if (!(skillid >= 10000 && skillid < 10015))
+ if ((skillid > MAX_SKILL) || (skillid < 0))
+ return 1;
+
if (pc_isGM(sd) >= 20)
return 0; // gm's can do anything damn thing they want