diff options
| author | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-26 02:03:07 +0000 |
|---|---|---|
| committer | (no author) <(no author)@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2005-01-26 02:03:07 +0000 |
| commit | 3f38fcaeaf61cf293c5392a67d85cfd5465d9585 (patch) | |
| tree | aaaff1ef4f447f5c16b599250b70e59c90fe757f /src/map | |
| parent | 30ff6f1cff9b99856f93e34cf4cc89ec54ec83a8 (diff) | |
| download | hercules-3f38fcaeaf61cf293c5392a67d85cfd5465d9585.tar.gz hercules-3f38fcaeaf61cf293c5392a67d85cfd5465d9585.tar.bz2 hercules-3f38fcaeaf61cf293c5392a67d85cfd5465d9585.tar.xz hercules-3f38fcaeaf61cf293c5392a67d85cfd5465d9585.zip | |
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@995 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/map.h | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/map/map.h b/src/map/map.h index d4f673d6a..ed66e5669 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -217,7 +217,7 @@ struct map_session_data { struct skill_unit_group_tickset skillunittick[MAX_SKILLUNITGROUPTICKSET]; struct skill_timerskill skilltimerskill[MAX_SKILLTIMERSKILL]; unsigned short timerskill_count; // [celest] - int cloneskill_id,cloneskill_lv; + int cloneskill_id; int potion_hp,potion_sp,potion_per_hp,potion_per_sp; int invincible_timer; diff --git a/src/map/skill.c b/src/map/skill.c index 55d3ce175..b42d3d898 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1804,13 +1804,11 @@ int skill_attack( int attack_type, struct block_list* src, struct block_list *ds && !(skillid > NPC_PIERCINGATT && skillid < NPC_SUMMONMONSTER) && !(skillid > NPC_SELFDESTRUCTION2 && skillid < NPC_UNDEADATTACK)){ //?に?んでいるスキルがあれば該?スキルを消す - if (tsd->cloneskill_id && tsd->cloneskill_lv && tsd->status.skill[tsd->cloneskill_id].flag==13){ + if (tsd->cloneskill_id && tsd->status.skill[tsd->cloneskill_id].flag==13){ tsd->status.skill[tsd->cloneskill_id].id=0; - tsd->status.skill[tsd->cloneskill_id].lv=0; tsd->status.skill[tsd->cloneskill_id].flag=0; } tsd->cloneskill_id=skillid; - tsd->cloneskill_lv=skilllv; tsd->status.skill[skillid].id=skillid; tsd->status.skill[skillid].lv=(pc_checkskill(tsd,RG_PLAGIARISM) > skill_get_max(skillid))? skill_get_max(skillid):pc_checkskill(tsd,RG_PLAGIARISM); |