summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-07 11:21:27 +0000
committershadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-07 11:21:27 +0000
commite4eafcc2608f0fcd52c26a4fad7ad14a58ba3a0c (patch)
tree27e8453c65b2836574819e0d28b79fd0c06a10f4
parent20222bc86fa3b46336b16c8423c423712c07eb1c (diff)
downloadhercules-e4eafcc2608f0fcd52c26a4fad7ad14a58ba3a0c.tar.gz
hercules-e4eafcc2608f0fcd52c26a4fad7ad14a58ba3a0c.tar.bz2
hercules-e4eafcc2608f0fcd52c26a4fad7ad14a58ba3a0c.tar.xz
hercules-e4eafcc2608f0fcd52c26a4fad7ad14a58ba3a0c.zip
Fixed GD_EMERGENCYCALL not working inside gvg castles when WoE is off, bugreport:1637 fix by Meyraw
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12770 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/skill.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 5b4dffa6f..ad714b796 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/06/07
+ * Fixed GD_EMERGENCYCALL not working inside gvg castles when WoE is off, bugreport:1637 fix by Meyraw [Brainstorm]
* Kaite should not work against high-level mobs (bugreport:1623)
* Fixed 'soundeffectall' not reading its params correctly [ultramage]
* Fixed PF_DOUBLECASTING casting % bugreport:140
diff --git a/src/map/skill.c b/src/map/skill.c
index f08fd1f80..1fcda26c7 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5018,7 +5018,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
for(i = 0; i < g->max_member; i++, j++) {
if (j>8) j=0;
if ((dstsd = g->member[i].sd) != NULL && sd != dstsd) {
- if (map[dstsd->bl.m].flag.nowarp && !map_flag_gvg(dstsd->bl.m))
+ if (map[dstsd->bl.m].flag.nowarp && !map[dstsd->bl.m].flag.gvg_castle)
continue;
if(map_getcell(src->m,src->x+dx[j],src->y+dy[j],CELL_CHKNOREACH))
dx[j] = dy[j] = 0;