summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c3
-rw-r--r--src/map/skill.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c
index a68d92ffc..62a656e01 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4011,13 +4011,12 @@ struct script_function buildin_func[] = {
BUILDIN_DEF(changebase,"i"),
BUILDIN_DEF(changesex,""),
BUILDIN_DEF(waitingroom,"si*"),
- BUILDIN_DEF(warpwaitingpc,"sii"),
BUILDIN_DEF(delwaitingroom,"*"),
BUILDIN_DEF2(waitingroomkickall,"kickwaitingroomall","*"),
BUILDIN_DEF(enablewaitingroomevent,"*"),
BUILDIN_DEF(disablewaitingroomevent,"*"),
BUILDIN_DEF(getwaitingroomstate,"i*"),
- BUILDIN_DEF(warpwaitingpc,"sii*"),
+ BUILDIN_DEF(warpwaitingpc,"sii?"),
BUILDIN_DEF(attachrid,"i"),
BUILDIN_DEF(detachrid,""),
BUILDIN_DEF(isloggedin,"i"),
diff --git a/src/map/skill.c b/src/map/skill.c
index 5e5cee3ac..a5f37f853 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3050,7 +3050,7 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
break;
case CH_PALMSTRIKE: // Palm Strike takes effect 1sec after casting. [Skotlex]
// clif_skill_nodamage(src,bl,skillid,skilllv,0); //Can't make this one display the correct attack animation delay :/
- clif_damage(src,bl,tick,status_get_amotion(src),0,0,1,4,0); //Displays MISS, but better than nothing :X
+ clif_damage(src,bl,tick,status_get_amotion(src),0,-1,1,4,0); //Display an absorbed damage attack.
skill_addtimerskill(src, tick + 1000, bl->id, 0, 0, skillid, skilllv, BF_WEAPON, flag);
break;