diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-14 15:39:24 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-14 15:39:24 +0000 |
| commit | f2a4147e83fc9d7e510f3d391fc87efcc44005e2 (patch) | |
| tree | 2aa1aecf371c27968d0c85cb9dc280efbc68df45 /src/map | |
| parent | 4be12e4c23f2a73543fa60ff3e0e0f4235a49ff0 (diff) | |
| download | hercules-f2a4147e83fc9d7e510f3d391fc87efcc44005e2.tar.gz hercules-f2a4147e83fc9d7e510f3d391fc87efcc44005e2.tar.bz2 hercules-f2a4147e83fc9d7e510f3d391fc87efcc44005e2.tar.xz hercules-f2a4147e83fc9d7e510f3d391fc87efcc44005e2.zip | |
- Shadow Jump no longer goes over walls.
- Insignificant cleanups.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8751 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/battle.c | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 5 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/map/battle.c b/src/map/battle.c index 246d3fae4..aea5d1444 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3440,7 +3440,6 @@ int battle_config_switch(const char *str) { strncmpi(str, "non",3) == 0 || strncmpi(str, "nein",4) == 0) return 0; - return atoi(str); } diff --git a/src/map/skill.c b/src/map/skill.c index 5842cdc31..58b3878b1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9006,12 +9006,11 @@ int skill_sit (struct map_session_data *sd, int type) if (!flag) return 0; - if(type==1) { + if(type) { if (map_foreachinrange(skill_sit_count,&sd->bl, range, BL_PC, flag) > 1) map_foreachinrange(skill_sit_in,&sd->bl, range, BL_PC, flag); return 0; - } - else if(type==0) { + } else { if (map_foreachinrange(skill_sit_count,&sd->bl, range, BL_PC, flag) < 2) map_foreachinrange(skill_sit_out,&sd->bl, range, BL_PC, flag); return 0; diff --git a/src/map/unit.c b/src/map/unit.c index 2bc274d10..87d10d160 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1020,7 +1020,7 @@ int unit_skilluse_pos2( struct block_list *src, int skill_x, int skill_y, int sk bl.m = src->m; bl.x = skill_x; bl.y = skill_y; - if(skill_num != TK_HIGHJUMP && skill_num != NJ_SHADOWJUMP && + if(skill_num != TK_HIGHJUMP && !battle_check_range(src,&bl,skill_get_range2(src, skill_num,skill_lv)+1)) return 0; |