diff options
| author | aleos <aleos@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2013-01-04 20:33:34 +0000 |
|---|---|---|
| committer | aleos <aleos@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2013-01-04 20:33:34 +0000 |
| commit | 39b04a578b2a74f9e48b0eb2583c249f98c9404d (patch) | |
| tree | 3ccb8106e58ab8623adec93663ba94b797a328d4 /src/map/skill.h | |
| parent | 56a299e66f3518feeb5dac9a5b469fd9a33a0c9a (diff) | |
| download | hercules-39b04a578b2a74f9e48b0eb2583c249f98c9404d.tar.gz hercules-39b04a578b2a74f9e48b0eb2583c249f98c9404d.tar.bz2 hercules-39b04a578b2a74f9e48b0eb2583c249f98c9404d.tar.xz hercules-39b04a578b2a74f9e48b0eb2583c249f98c9404d.zip | |
> Follow-up to r17065:
* Further harmonized skill_id and skill_lv variables.
* Fixed trap skill item requirement checking for signed return and being set to unsigned variable. (bugreport:7085, bugreport:7114)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17076 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.h')
| -rw-r--r-- | src/map/skill.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/skill.h b/src/map/skill.h index afef8b5a2..dc7499857 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -311,10 +311,10 @@ int skill_vfcastfix( struct block_list *bl, double time, uint16 skill_id, uint16 int skill_delayfix( struct block_list *bl, uint16 skill_id, uint16 skill_lv); // Skill conditions check and remove [Inkfish] -int skill_check_condition_castbegin(struct map_session_data *sd, short skill, short lv); -int skill_check_condition_castend(struct map_session_data *sd, short skill, short lv); -int skill_consume_requirement(struct map_session_data *sd, short skill, short lv, short type); -struct skill_condition skill_get_requirement(struct map_session_data *sd, short skill, short lv); +int skill_check_condition_castbegin(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +int skill_check_condition_castend(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); +int skill_consume_requirement(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, short type); +struct skill_condition skill_get_requirement(struct map_session_data *sd, uint16 skill_id, uint16 skill_lv); int skill_check_pc_partner(struct map_session_data *sd, uint16 skill_id, short* skill_lv, int range, int cast_flag); // -- moonsoul (added skill_check_unit_cell) |