diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-17 07:38:11 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-17 07:38:11 +0000 |
| commit | f1e4db40673f16acccc709d8176d45fba0c4e178 (patch) | |
| tree | 38c66412a1576691c63c8aea0859670fd2636c3c | |
| parent | 0aac9d598500a6aadabd1cfb0a9904b877bd5393 (diff) | |
| download | hercules-f1e4db40673f16acccc709d8176d45fba0c4e178.tar.gz hercules-f1e4db40673f16acccc709d8176d45fba0c4e178.tar.bz2 hercules-f1e4db40673f16acccc709d8176d45fba0c4e178.tar.xz hercules-f1e4db40673f16acccc709d8176d45fba0c4e178.zip | |
Icewalls can no longer be knocked back (see bugreport:38)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12083 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index abcf33f7f..a8ca7be1a 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ 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/01/17 + * Icewalls can no longer be knocked back (see bugreport:38) 2008/01/15 * Manner system fixing [ultramage] - better-than-aegis 'red bubble' packet updates; now it shows correctly diff --git a/src/map/skill.c b/src/map/skill.c index e2a789486..a35968b13 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -9835,8 +9835,11 @@ int skill_unit_move_unit_group (struct skill_unit_group *group, int m, int dx, i if (group->unit==NULL) return 0; - if (skill_get_unit_flag(group->skill_id)&UF_ENSEMBLE) //Ensembles may not be moved around. - return 0; + if (skill_get_unit_flag(group->skill_id)&UF_ENSEMBLE) + return 0; //Ensembles may not be moved around. + + if( group->unit_id == UNT_ICEWALL ) + return 0; //Icewalls don't get knocked back m_flag = (int *) aCalloc(group->unit_count, sizeof(int)); // m_flag |