summaryrefslogtreecommitdiff
path: root/src/map/npc.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-24 16:13:40 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-24 16:49:05 -0700
commitc093f4cce643e245ab2048e0782237744208eb9f (patch)
treeedcfb0fbdd57acc1df658d30fe4c87663d938044 /src/map/npc.cpp
parent5cbd4c728046b4b12d289bf9b7edbc2c7b589fca (diff)
downloadtmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.gz
tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.bz2
tmwa-c093f4cce643e245ab2048e0782237744208eb9f.tar.xz
tmwa-c093f4cce643e245ab2048e0782237744208eb9f.zip
Header cleanup
Diffstat (limited to 'src/map/npc.cpp')
-rw-r--r--src/map/npc.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index 9f606de..32711d0 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -21,10 +21,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <cassert>
-#include <cstdlib>
-#include <cstring>
#include <ctime>
+#include <algorithm>
#include <list>
#include "../compat/fun.hpp"
@@ -34,6 +33,7 @@
#include "../strings/astring.hpp"
#include "../strings/zstring.hpp"
#include "../strings/xstring.hpp"
+#include "../strings/literal.hpp"
#include "../generic/db.hpp"
@@ -42,8 +42,8 @@
#include "../mmo/config_parse.hpp"
#include "../mmo/extract.hpp"
-#include "../mmo/socket.hpp"
#include "../mmo/timer.hpp"
+#include "../mmo/utils.hpp"
#include "battle.hpp"
#include "clif.hpp"