diff options
| author | meko <mekolat@users.noreply.github.com> | 2015-04-15 12:42:07 -0400 |
|---|---|---|
| committer | mekolat <mekolat@gmail.com> | 2015-04-15 12:46:06 -0400 |
| commit | b40878ca800cdbd9b3e79b3880ccfd9e9b65483d (patch) | |
| tree | e189876827c6577939aaa2892554e5cbcc53b132 /src/map/script-fun.cpp | |
| parent | 0b04c49460a2e0c894c818ae190465fc2607bca8 (diff) | |
| download | tmwa-b40878ca800cdbd9b3e79b3880ccfd9e9b65483d.tar.gz tmwa-b40878ca800cdbd9b3e79b3880ccfd9e9b65483d.tar.bz2 tmwa-b40878ca800cdbd9b3e79b3880ccfd9e9b65483d.tar.xz tmwa-b40878ca800cdbd9b3e79b3880ccfd9e9b65483d.zip | |
remove special warp names
Diffstat (limited to 'src/map/script-fun.cpp')
| -rw-r--r-- | src/map/script-fun.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index 3b814aa..c327f26 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -338,22 +338,10 @@ void builtin_warp(ScriptState *st) { int x, y; dumb_ptr<map_session_data> sd = script_rid2sd(st); - MapName str = stringish<MapName>(ZString(conv_str(st, &AARG(0)))); x = conv_num(st, &AARG(1)); y = conv_num(st, &AARG(2)); - if (str == "Random"_s) - pc_randomwarp(sd, BeingRemoveWhy::WARPED); - else if (str == "SavePoint"_s or str == "Save"_s) - { - if (sd->bl_m->flag.get(MapFlag::NORETURN)) - return; - - pc_setpos(sd, sd->status.save_point.map_, sd->status.save_point.x, sd->status.save_point.y, - BeingRemoveWhy::WARPED); - } - else - pc_setpos(sd, str, x, y, BeingRemoveWhy::GONE); + pc_setpos(sd, str, x, y, BeingRemoveWhy::GONE); } /*========================================== @@ -364,10 +352,7 @@ static void builtin_areawarp_sub(dumb_ptr<block_list> bl, MapName mapname, int x, int y) { dumb_ptr<map_session_data> sd = bl->is_player(); - if (mapname == "Random"_s) - pc_randomwarp(sd, BeingRemoveWhy::WARPED); - else - pc_setpos(sd, mapname, x, y, BeingRemoveWhy::GONE); + pc_setpos(sd, mapname, x, y, BeingRemoveWhy::GONE); } static |