From 8d50ad7f65c46d83b44c18249566a16c6d290496 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Tue, 25 Mar 2014 18:32:46 -0700 Subject: Mapflag to override savepoint (ported from wushin) --- src/map/clif.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'src/map/clif.cpp') diff --git a/src/map/clif.cpp b/src/map/clif.cpp index 3ec41ae..a5b02cd 100644 --- a/src/map/clif.cpp +++ b/src/map/clif.cpp @@ -3905,9 +3905,18 @@ void clif_parse_Restart(Session *s, dumb_ptr sd) { pc_setstand(sd); pc_setrestartvalue(sd, 3); - pc_setpos(sd, sd->status.save_point.map_, - sd->status.save_point.x, sd->status.save_point.y, - BeingRemoveWhy::QUIT); + if (sd->bl_m->flag.get(MapFlag::RESAVE)) + { + pc_setpos(sd, sd->bl_m->resave.map_, + sd->bl_m->resave.x, sd->bl_m->resave.y, + BeingRemoveWhy::QUIT); + } + else + { + pc_setpos(sd, sd->status.save_point.map_, + sd->status.save_point.x, sd->status.save_point.y, + BeingRemoveWhy::QUIT); + } } break; case 0x01: -- cgit v1.2.3-60-g2f50