diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-05-01 19:50:31 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-05-01 20:31:47 -0400 |
| commit | 0384d11f9b92d1368a87d5351db983a7b94b5042 (patch) | |
| tree | 7ad0774887c262964d9374d1d7ad33bb1d71b375 | |
| parent | 360614b270acb47643fcf6216dd32b10dfab81dd (diff) | |
| download | tmwa-0384d11f9b92d1368a87d5351db983a7b94b5042.tar.gz tmwa-0384d11f9b92d1368a87d5351db983a7b94b5042.tar.bz2 tmwa-0384d11f9b92d1368a87d5351db983a7b94b5042.tar.xz tmwa-0384d11f9b92d1368a87d5351db983a7b94b5042.zip | |
revert attachrid modification for now, will be deprecated soon enough
| -rw-r--r-- | src/map/script-fun.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index 0b1e7e6..90eb557 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -3222,17 +3222,10 @@ void builtin_resetstatus(ScriptState *st) static void builtin_attachrid(ScriptState *st) { - dumb_ptr<map_session_data> sd = map_id2sd(st->rid); - BlockId newid = wrap<BlockId>(conv_num(st, &AARG(0))); - - if (sd && newid != st->rid) - sd->npc_id = BlockId(); - - st->rid = newid; + st->rid = wrap<BlockId>(conv_num(st, &AARG(0))); push_int<ScriptDataInt>(st->stack, (map_id2sd(st->rid) != nullptr)); } - /*========================================== * RIDのデタッチ *------------------------------------------ @@ -3240,9 +3233,6 @@ void builtin_attachrid(ScriptState *st) static void builtin_detachrid(ScriptState *st) { - dumb_ptr<map_session_data> sd = map_id2sd(st->rid); - if (sd) - sd->npc_id = BlockId(); st->rid = BlockId(); } |