summaryrefslogtreecommitdiff
path: root/src/map/magic-interpreter-base.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-04-24 22:09:54 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-04-24 22:31:00 -0700
commitdc0762c547cab250d4fe081706930582a27c0b46 (patch)
tree82b00bc460af9543769e4769521b2fc73fdb2437 /src/map/magic-interpreter-base.cpp
parentc093f4cce643e245ab2048e0782237744208eb9f (diff)
downloadtmwa-dc0762c547cab250d4fe081706930582a27c0b46.tar.gz
tmwa-dc0762c547cab250d4fe081706930582a27c0b46.tar.bz2
tmwa-dc0762c547cab250d4fe081706930582a27c0b46.tar.xz
tmwa-dc0762c547cab250d4fe081706930582a27c0b46.zip
Conform magic headers to the decl/def rule
Diffstat (limited to 'src/map/magic-interpreter-base.cpp')
-rw-r--r--src/map/magic-interpreter-base.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp
index a7c5496..baec6fb 100644
--- a/src/map/magic-interpreter-base.cpp
+++ b/src/map/magic-interpreter-base.cpp
@@ -1,5 +1,4 @@
#include "magic-interpreter-base.hpp"
-#include "magic.hpp"
// magic-interpreter-base.cpp - Core of the old magic system.
//
// Copyright © 2004-2011 The Mana World Development Team
@@ -22,8 +21,6 @@
#include <algorithm>
-#include "magic-interpreter.hpp"
-
#include "../strings/astring.hpp"
#include "../strings/xstring.hpp"
@@ -31,8 +28,9 @@
#include "../mmo/timer.hpp"
+#include "magic.hpp"
#include "magic-expr.hpp"
-
+#include "magic-interpreter.hpp"
#include "pc.hpp"
#include "../poison.hpp"