From 730e5dde39333cb2f63c72a7d7152bee5c4dbb05 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 8 Feb 2014 15:09:25 -0800 Subject: Implement AString --- src/map/magic-interpreter-base.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 0ba145a..f1878a0 100644 --- a/src/map/magic-interpreter-base.cpp +++ b/src/map/magic-interpreter-base.cpp @@ -3,7 +3,7 @@ #include "magic-interpreter-aux.hpp" #include "magic-interpreter.hpp" -#include "../strings/fstring.hpp" +#include "../strings/astring.hpp" #include "../strings/xstring.hpp" #include "../io/cxxstdio.hpp" @@ -68,13 +68,13 @@ void set_spell SETTER(dumb_ptr, TYPE::SPELL, v_spell) magic_conf_t magic_conf; /* Global magic conf */ env_t magic_default_env = { &magic_conf, NULL }; -FString magic_find_invocation(XString spellname) +AString magic_find_invocation(XString spellname) { auto it = magic_conf.spells_by_name.find(spellname); if (it != magic_conf.spells_by_name.end()) return it->second->invocation; - return FString(); + return AString(); } dumb_ptr magic_find_spell(XString invocation) @@ -90,14 +90,14 @@ dumb_ptr magic_find_spell(XString invocation) /* Spell anchors */ /* -------------------------------------------------------------------------------- */ -FString magic_find_anchor_invocation(XString anchor_name) +AString magic_find_anchor_invocation(XString anchor_name) { auto it = magic_conf.anchors_by_name.find(anchor_name); if (it != magic_conf.anchors_by_name.end()) return it->second->invocation; - return FString(); + return AString(); } dumb_ptr magic_find_anchor(XString name) -- cgit v1.2.3-60-g2f50