Browse Source

- Shadow Jump no longer goes over walls.
- Insignificant cleanups.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8751 54d463be-8e91-2dee-dedb-b68131a5f0ec

skotlex 19 years ago
parent
commit
c9f9218a2b
4 changed files with 4 additions and 5 deletions
  1. 1 0
      Changelog-Trunk.txt
  2. 0 1
      src/map/battle.c
  3. 2 3
      src/map/skill.c
  4. 1 1
      src/map/unit.c

+ 1 - 0
Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/09/14
+	* Shadow Jump no longer goes over walls. [Skotlex]
 	* battle_calc_gvg_damage will be invoked in gvg maps regardless of woe
 	  time. [Skotlex]
 	* NPC_MENTALBREAKER now zaps matk*lv SP based on observations by Tharis.

+ 0 - 1
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);
 }
 

+ 2 - 3
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;

+ 1 - 1
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;