diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2016-04-24 14:15:28 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-24 14:15:28 -0400 |
| commit | adda881817c349e141a7b3f9c43fb98932a63803 (patch) | |
| tree | 95330adc85016873f711265383a2c60cdecfdd7e /src/map/npc-parse.cpp | |
| parent | b19a8149a4400180427cf9acbd1498151ccb22c7 (diff) | |
| parent | 6fac3210f0de07ab1ff483875ac517a3eea7367a (diff) | |
| download | tmwa-adda881817c349e141a7b3f9c43fb98932a63803.tar.gz tmwa-adda881817c349e141a7b3f9c43fb98932a63803.tar.bz2 tmwa-adda881817c349e141a7b3f9c43fb98932a63803.tar.xz tmwa-adda881817c349e141a7b3f9c43fb98932a63803.zip | |
Merge pull request #213 from mekolat/params
fixes for magic-v3
Diffstat (limited to 'src/map/npc-parse.cpp')
| -rw-r--r-- | src/map/npc-parse.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/npc-parse.cpp b/src/map/npc-parse.cpp index 164d793..99e6267 100644 --- a/src/map/npc-parse.cpp +++ b/src/map/npc-parse.cpp @@ -142,6 +142,7 @@ bool npc_load_warp(ast::npc::Warp& warp) nd->bl_id = npc_get_new_npc_id(); nd->n = map_addnpc(m, nd); + nd->sex = SEX::UNSPECIFIED; nd->bl_prev = nd->bl_next = nullptr; nd->bl_m = m; nd->bl_x = x; @@ -208,6 +209,7 @@ bool npc_load_shop(ast::npc::Shop& shop) } } + nd->sex = SEX::UNSPECIFIED; nd->bl_prev = nd->bl_next = nullptr; nd->bl_m = m; nd->bl_x = x; @@ -435,6 +437,7 @@ bool npc_load_script_none(ast::script::ScriptBody& body, ast::npc::ScriptNone& s nd->name = script_none.name.data; + nd->sex = SEX::UNSPECIFIED; nd->bl_prev = nd->bl_next = nullptr; nd->bl_m = borrow(undefined_gat); nd->bl_x = 0; @@ -542,7 +545,7 @@ bool npc_load_script_map(ast::script::ScriptBody& body, ast::npc::ScriptMap& scr } nd->name = script_map.name.data; - + nd->sex = SEX::UNSPECIFIED; nd->bl_prev = nd->bl_next = nullptr; nd->bl_m = m; nd->bl_x = x; |