diff options
author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-07 23:23:53 +0000 |
---|---|---|
committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-02-07 23:23:53 +0000 |
commit | c4dcc1a9106ce01cf02b0ffc32ab4498957ac390 (patch) | |
tree | 55f2e032ac7728203541f7777dd531ce8d11643e /src | |
parent | ff28bd5e88ed683f73022dcf10f00a67898536ed (diff) | |
download | hercules-c4dcc1a9106ce01cf02b0ffc32ab4498957ac390.tar.gz hercules-c4dcc1a9106ce01cf02b0ffc32ab4498957ac390.tar.bz2 hercules-c4dcc1a9106ce01cf02b0ffc32ab4498957ac390.tar.xz hercules-c4dcc1a9106ce01cf02b0ffc32ab4498957ac390.zip |
- Modified spider web so that the skill_unit_db flag restrictions may take place.
- Modified Spider web so that it can't be casted on top of another web.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9821 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r-- | src/map/skill.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 17123f72d..cdba67d5f 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -3307,7 +3307,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in return skill_castend_damage_id (src, bl, skillid, skilllv, tick, flag); default: //Skill is actually ground placed. - if ((src == bl || skillid == PF_SPIDERWEB) && skill_get_unit_id(skillid,0)) + if (src == bl && skill_get_unit_id(skillid,0)) return skill_castend_pos2(src,bl->x,bl->y,skillid,skilllv,tick,0); } @@ -5556,11 +5556,12 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) case WE_CALLPARENT: case WE_CALLBABY: case AM_RESURRECTHOMUN: + case PF_SPIDERWEB: //Find a random spot to place the skill. [Skotlex] inf2 = skill_get_splash(ud->skillid, ud->skilllv); ud->skillx = src->x + inf2; ud->skilly = src->y + inf2; - if (!map_random_dir(src, &ud->skillx, &ud->skilly)) { + if (inf2 && !map_random_dir(src, &ud->skillx, &ud->skilly)) { ud->skillx = src->x; ud->skilly = src->y; } |