diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-28 16:24:39 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-28 16:24:39 +0000 |
| commit | b31f1a4805c6119e7463f1cb8dd5933b7d68e101 (patch) | |
| tree | 9986317db69f798fec96c6483e77e2fb5d6375a3 /src | |
| parent | a30098328dd23029f3385d8e8f74bac626850dbe (diff) | |
| download | hercules-b31f1a4805c6119e7463f1cb8dd5933b7d68e101.tar.gz hercules-b31f1a4805c6119e7463f1cb8dd5933b7d68e101.tar.bz2 hercules-b31f1a4805c6119e7463f1cb8dd5933b7d68e101.tar.xz hercules-b31f1a4805c6119e7463f1cb8dd5933b7d68e101.zip | |
- Fixed the definition of warpwaitingpc so that it allows an optional argument (number of people to warp).
- Modified the Palm Strike packet so the initial hit animation does not displays "Miss".
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9935 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/script.c | 3 | ||||
| -rw-r--r-- | src/map/skill.c | 2 |
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; |