summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-01 11:21:49 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-01 11:21:49 +0000
commit517031c26c79c6375120c73a2e16fc129428f10b (patch)
tree0884e74e525a6bf4872615a677a33ca56cdf3a22 /src
parent8887e1f2db70b4bb07ed68342ddc797026092171 (diff)
downloadhercules-517031c26c79c6375120c73a2e16fc129428f10b.tar.gz
hercules-517031c26c79c6375120c73a2e16fc129428f10b.tar.bz2
hercules-517031c26c79c6375120c73a2e16fc129428f10b.tar.xz
hercules-517031c26c79c6375120c73a2e16fc129428f10b.zip
* Rev. 13251 Removed 'casttime' adjustment from offensive ressurection. Follow up to r13225.
* Kaahi will now override override higher existing levels previously casted. (bugreport:2296) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13251 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/status.c3
-rw-r--r--src/map/unit.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c
index b1fd9df34..b862137f3 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5134,8 +5134,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
return 1;
break;
case SC_KAAHI:
- if(sce->val1 > val1)
- return 1;
+ //Kaahi overwrites previous level regardless of existing level.
//Delete timer if it exists.
if (sce->val4 != -1) {
delete_timer(sce->val4,kaahi_heal_timer);
diff --git a/src/map/unit.c b/src/map/unit.c
index bb1a02514..3049f0457 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -987,7 +987,6 @@ int unit_skilluse_id2(struct block_list *src, int target_id, short skill_num, sh
case ALL_RESURRECTION:
if(battle_check_undead(tstatus->race,tstatus->def_ele)) {
temp = 1;
- casttime = skill_castfix(src, ALL_RESURRECTION, skill_lv);
} else if (!status_isdead(target))
return 0; //Can't cast on non-dead characters.
break;