diff options
| author | Wushin <pasekei@gmail.com> | 2015-05-19 21:50:41 -0500 |
|---|---|---|
| committer | Wushin <pasekei@gmail.com> | 2015-05-19 21:50:41 -0500 |
| commit | 29ce27e1557404b6cd03eaab2367c5a698e6ab44 (patch) | |
| tree | 28da27416f52edaa41c049a60ebcc4869ddde1f2 /src/map/npc-parse.cpp | |
| parent | 20cbf97dbaded8c2bead5b4f1a4838528c63a2a5 (diff) | |
| parent | 4166a53fa3ced75afa25bd5bfb20ca87eca0e25f (diff) | |
| download | tmwa-15.5.19.tar.gz tmwa-15.5.19.tar.bz2 tmwa-15.5.19.tar.xz tmwa-15.5.19.zip | |
Merge pull request #89 from mekolat/sitv15.5.19
allow to make npcs sit
Diffstat (limited to 'src/map/npc-parse.cpp')
| -rw-r--r-- | src/map/npc-parse.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp index 4d9fcbd..0a0d682 100644 --- a/src/map/npc-parse.cpp +++ b/src/map/npc-parse.cpp @@ -152,6 +152,7 @@ bool npc_load_warp(ast::npc::Warp& warp) nd->bl_y = y; nd->dir = DIR::S; nd->flag = 0; + nd->sit = DamageType::STAND; nd->name = warp.name.data; nd->npc_class = WARP_CLASS; @@ -233,6 +234,7 @@ bool npc_load_shop(ast::npc::Shop& shop) nd->bl_id = npc_get_new_npc_id(); nd->dir = dir; nd->flag = 0; + nd->sit = DamageType::STAND; nd->name = shop.name.data; nd->npc_class = npc_class; nd->speed = 200_ms; @@ -446,6 +448,7 @@ bool npc_load_script_none(ast::script::ScriptBody& body, ast::npc::ScriptNone& s nd->bl_id = npc_get_new_npc_id(); nd->dir = DIR::S; nd->flag = 0; + nd->sit = DamageType::STAND; nd->npc_class = INVISIBLE_CLASS; nd->speed = 200_ms; nd->scr.script = std::move(script); @@ -567,6 +570,7 @@ bool npc_load_script_map(ast::script::ScriptBody& body, ast::npc::ScriptMap& scr nd->bl_id = npc_get_new_npc_id(); nd->dir = dir; nd->flag = 0; + nd->sit = DamageType::STAND; nd->npc_class = npc_class; nd->speed = 200_ms; nd->scr.script = std::move(script); |