From c093f4cce643e245ab2048e0782237744208eb9f Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Thu, 24 Apr 2014 16:13:40 -0700 Subject: Header cleanup --- src/map/magic-interpreter-base.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/map/magic-interpreter-base.cpp') diff --git a/src/map/magic-interpreter-base.cpp b/src/map/magic-interpreter-base.cpp index 5d8aa35..a7c5496 100644 --- a/src/map/magic-interpreter-base.cpp +++ b/src/map/magic-interpreter-base.cpp @@ -1,4 +1,5 @@ #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 @@ -19,7 +20,8 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -#include "magic-interpreter-aux.hpp" +#include + #include "magic-interpreter.hpp" #include "../strings/astring.hpp" @@ -296,7 +298,7 @@ int spellguard_can_satisfy(spellguard_check_t *check, dumb_ptr interval_t casttime = check->casttime; if (env->VAR(VAR_MIN_CASTTIME).ty == TYPE::INT) - casttime = max(casttime, static_cast(env->VAR(VAR_MIN_CASTTIME).v.v_int)); + casttime = std::max(casttime, static_cast(env->VAR(VAR_MIN_CASTTIME).v.v_int)); caster->cast_tick = tick + casttime; /* Make sure not to cast too frequently */ -- cgit v1.2.3-60-g2f50