Bladeren bron

- Corrected pc_checkitem not behaving correctly when you had more than one equip with a restricted card.
- Fixed non-chatroom owners being able to kick others from the chatroom.


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

skotlex 17 jaren geleden
bovenliggende
commit
3a36995d8b
2 gewijzigde bestanden met toevoegingen van 3 en 1 verwijderingen
  1. 1 0
      Changelog-Trunk.txt
  2. 2 1
      src/map/skill.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.
 
 2008/03/06
+	* Fixed song/dance cells to appear even on top of walls and pits.
 	* Fixed non-chatroom owners being able to kick others from the chatroom.
 	  [Skotlex]
 	* Fixed a crash when a homun kills a mvp and the char that did

+ 2 - 1
src/map/skill.c

@@ -6432,7 +6432,8 @@ struct skill_unit_group* skill_unitsetting (struct block_list *src, short skilli
 		if(range<=0)
 			map_foreachincell(skill_cell_overlap,src->m,ux,uy,BL_SKILL,skillid,&alive, src);
 		
-		if( alive && map_getcell(src->m,ux,uy,CELL_CHKWALL) )
+		//Song/dances/encores are displayed even over pits/walls.
+		if( alive && map_getcell(src->m,ux,uy,CELL_CHKWALL) && !group->state.song_dance )
 			alive = 0;
 		
 		if( alive && battle_config.skill_wall_check && !path_search_long(NULL,src->m,ux,uy,x,y,CELL_CHKWALL) )