From 0f670e5a6e960a8d06fc8f9f15440851c935411d Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sat, 29 May 2010 17:37:57 +0000 Subject: 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 --- src/map/script.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') 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; } -- cgit v1.2.3-70-g09d2