diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-06 19:58:53 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-06 19:58:53 +0000 |
| commit | 971b8b917ed569279ed03e02b733fb9819125d70 (patch) | |
| tree | 61aaf7cb1fd3a582ce1ccd5d92c06147c0defab5 | |
| parent | 2462d4ff90d5444883f4981f0229e223fbf80057 (diff) | |
| download | hercules-971b8b917ed569279ed03e02b733fb9819125d70.tar.gz hercules-971b8b917ed569279ed03e02b733fb9819125d70.tar.bz2 hercules-971b8b917ed569279ed03e02b733fb9819125d70.tar.xz hercules-971b8b917ed569279ed03e02b733fb9819125d70.zip | |
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12311 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0d48f491b..9fb7dcd39 100644 --- a/Changelog-Trunk.txt +++ b/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 diff --git a/src/map/skill.c b/src/map/skill.c index 11acaa106..c80e46f57 100644 --- a/src/map/skill.c +++ b/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) ) |