diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-24 16:13:40 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-24 16:49:05 -0700 |
| commit | c093f4cce643e245ab2048e0782237744208eb9f (patch) | |
| tree | edcfb0fbdd57acc1df658d30fe4c87663d938044 /src/map/map.cpp | |
| parent | 5cbd4c728046b4b12d289bf9b7edbc2c7b589fca (diff) | |
| download | tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.gz tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.bz2 tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.xz tmwa-c093f4cce643e245ab2048e0782237744208eb9f.zip | |
Header cleanup
Diffstat (limited to 'src/map/map.cpp')
| -rw-r--r-- | src/map/map.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/map/map.cpp b/src/map/map.cpp index 8ca0ba7..c98c315 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -29,7 +29,6 @@ #include <cassert> #include <cstdlib> -#include <cstring> #include "../compat/nullpo.hpp" #include "../compat/fun.hpp" @@ -40,6 +39,7 @@ #include "../strings/zstring.hpp" #include "../strings/xstring.hpp" #include "../strings/vstring.hpp" +#include "../strings/literal.hpp" #include "../generic/db.hpp" #include "../generic/random2.hpp" @@ -54,6 +54,7 @@ #include "../mmo/extract.hpp" #include "../mmo/socket.hpp" #include "../mmo/timer.hpp" +#include "../mmo/utils.hpp" #include "../mmo/version.hpp" #include "atcommand.hpp" @@ -63,7 +64,7 @@ #include "grfio.hpp" #include "itemdb.hpp" #include "magic.hpp" -#include "magic-interpreter.hpp" +#include "magic-interpreter.hpp" // for is_spell inline body #include "magic-v2.hpp" #include "mob.hpp" #include "npc.hpp" @@ -114,6 +115,10 @@ void SessionDeleter::operator()(SessionData *sd) really_delete1 static_cast<map_session_data *>(sd); } +VString<49> convert_for_printf(NpcEvent ev) +{ + return STRNPRINTF(50, "%s::%s"_fmt, ev.npc, ev.label); +} bool extract(XString str, NpcEvent *ev) { XString mid; |