summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-05-29 17:37:57 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-05-29 17:37:57 +0000
commit0f670e5a6e960a8d06fc8f9f15440851c935411d (patch)
tree1889ac24bb7c7d5b94a056ffed9ac484a46f858a /src/map
parent613b76cccd9d71a2537d37d0a533afe68205da87 (diff)
downloadhercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.gz
hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.bz2
hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.tar.xz
hercules-0f670e5a6e960a8d06fc8f9f15440851c935411d.zip
Added a pc_isdead check to warpparty. Only warp and mapwarp (moveto, warpallpcinthemap, and warpwaitingpc aegis script equivilents) should revive players when placing them on new maps.
Updated F_CashPartyCall to use warpparty. Renamed original function to F_CashPartyCall2 and commented out. Fixed an error in the monster race npcs calling a nonexistant OnEnable. Renamed 'Tabb' in the 13.1 Draco egg daily quest to 'Taab'. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14313 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c
index fdd7c9f74..f542ff04a 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4261,6 +4261,9 @@ BUILDIN_FUNC(warpparty)
if( str2 && strcmp(str2, map[pl_sd->bl.m].name) != 0 )
continue;
+ if( pc_isdead(pl_sd) )
+ continue;
+
switch( type )
{
case 0: // Random
@@ -4293,7 +4296,7 @@ BUILDIN_FUNC(warpparty)
}
break;
case 4: // m,x,y
- if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp)
+ if(!map[pl_sd->bl.m].flag.noreturn && !map[pl_sd->bl.m].flag.nowarp)
pc_setpos(pl_sd,mapindex_name2id(str),x,y,3);
break;
}