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/magic-interpreter-base.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/magic-interpreter-base.cpp')
| -rw-r--r-- | src/map/magic-interpreter-base.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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 <http://www.gnu.org/licenses/>. -#include "magic-interpreter-aux.hpp" +#include <algorithm> + #include "magic-interpreter.hpp" #include "../strings/astring.hpp" @@ -296,7 +298,7 @@ int spellguard_can_satisfy(spellguard_check_t *check, dumb_ptr<map_session_data> interval_t casttime = check->casttime; if (env->VAR(VAR_MIN_CASTTIME).ty == TYPE::INT) - casttime = max(casttime, static_cast<interval_t>(env->VAR(VAR_MIN_CASTTIME).v.v_int)); + casttime = std::max(casttime, static_cast<interval_t>(env->VAR(VAR_MIN_CASTTIME).v.v_int)); caster->cast_tick = tick + casttime; /* Make sure not to cast too frequently */ |