diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-03-25 18:32:46 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-03-25 20:52:28 -0700 |
| commit | 8d50ad7f65c46d83b44c18249566a16c6d290496 (patch) | |
| tree | 4ad6e759a873f1cf27d161bb153cb30616a3a7c7 /src/map/clif.cpp | |
| parent | e63df20c3838fb6760c7d891cccfc901fb8bec41 (diff) | |
| download | tmwa-8d50ad7f65c46d83b44c18249566a16c6d290496.tar.gz tmwa-8d50ad7f65c46d83b44c18249566a16c6d290496.tar.bz2 tmwa-8d50ad7f65c46d83b44c18249566a16c6d290496.tar.xz tmwa-8d50ad7f65c46d83b44c18249566a16c6d290496.zip | |
Mapflag to override savepoint (ported from wushin)
Diffstat (limited to 'src/map/clif.cpp')
| -rw-r--r-- | src/map/clif.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
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<map_session_data> 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: |