summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-03-31 14:19:47 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-03-31 14:19:47 -0700
commit48d87398d76a7213574b39c151ae0f10e19aa89b (patch)
tree9b2db9f68b98c2c39b4158ad8e966ff47886657e
parent993830a5063b8d2af4240ea5bf1c06dfa4f66b7d (diff)
downloadtmwa-48d87398d76a7213574b39c151ae0f10e19aa89b.tar.gz
tmwa-48d87398d76a7213574b39c151ae0f10e19aa89b.tar.bz2
tmwa-48d87398d76a7213574b39c151ae0f10e19aa89b.tar.xz
tmwa-48d87398d76a7213574b39c151ae0f10e19aa89b.zip
Unbreak @npcmove
-rw-r--r--src/login/login.cpp1
-rw-r--r--src/map/atcommand.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/login/login.cpp b/src/login/login.cpp
index ddc3d89..0a4ac99 100644
--- a/src/login/login.cpp
+++ b/src/login/login.cpp
@@ -165,6 +165,7 @@ struct AuthFifo
SEX sex;
int delflag;
};
+static
Array<AuthFifo, AUTH_FIFO_SIZE> auth_fifo;
static
int auth_fifo_pos = 0;
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index cf71ff6..b44351a 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -4105,8 +4105,10 @@ ATCE atcommand_npcmove(Session *, dumb_ptr<map_session_data>,
return ATCE::EXIST;
npc_enable(character, 0);
+ map_delblock(nd);
nd->bl_x = x;
nd->bl_y = y;
+ map_addblock(nd);
npc_enable(character, 1);
return ATCE::OKAY;