From 0384d11f9b92d1368a87d5351db983a7b94b5042 Mon Sep 17 00:00:00 2001
From: mekolat <mekolat@users.noreply.github.com>
Date: Sun, 1 May 2016 19:50:31 -0400
Subject: revert attachrid modification for now, will be deprecated soon enough
---
src/map/script-fun.cpp | 12 +-----------
1 file changed, 1 insertion(+), 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();
}
--
cgit v1.2.3-70-g09d2