diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-09-26 23:55:29 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-10-05 13:42:45 -0700 |
| commit | caae1e38d0d239f4f7088a64526fe1d2f6587999 (patch) | |
| tree | 42ba875885f7593c070da93f828b7ae38ea2dc7c /src/map/npc.cpp | |
| parent | 06c411ef291e1f608487989b0da63aefbbdfefc1 (diff) | |
| download | tmwa-caae1e38d0d239f4f7088a64526fe1d2f6587999.tar.gz tmwa-caae1e38d0d239f4f7088a64526fe1d2f6587999.tar.bz2 tmwa-caae1e38d0d239f4f7088a64526fe1d2f6587999.tar.xz tmwa-caae1e38d0d239f4f7088a64526fe1d2f6587999.zip | |
Split string header into pieces
Diffstat (limited to 'src/map/npc.cpp')
| -rw-r--r-- | src/map/npc.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp index bca4eab..28f348e 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -7,6 +7,11 @@ #include <list> +#include "../strings/mstring.hpp" +#include "../strings/fstring.hpp" +#include "../strings/zstring.hpp" +#include "../strings/xstring.hpp" + #include "../common/cxxstdio.hpp" #include "../common/db.hpp" #include "../common/extract.hpp" @@ -1208,7 +1213,7 @@ int npc_parse_script(XString w1, XString w2, NpcName w3, ZString w4, (*lines)++; if (feof(fp)) break; - ZString line(ZString::really_construct_from_a_pointer, line_, nullptr); + ZString line(strings::really_construct_from_a_pointer, line_, nullptr); if (!srcbuf) { // may be a no-op @@ -1403,7 +1408,7 @@ int npc_parse_function(XString, XString, XString w3, ZString, (*lines)++; if (feof(fp)) break; - ZString line(ZString::really_construct_from_a_pointer, line_, nullptr); + ZString line(strings::really_construct_from_a_pointer, line_, nullptr); if (!srcbuf) { srcbuf += line.xislice_t(std::find(line.begin(), line.end(), '{')); @@ -1731,7 +1736,7 @@ int do_init_npc(void) { // because it's still fgets line_[strlen(line_) - 1] = '\0'; - ZString zline(ZString::really_construct_from_a_pointer, line_, nullptr); + ZString zline(strings::really_construct_from_a_pointer, line_, nullptr); XString w1, w2, w3, w4x; ZString w4z; lines++; |