From 3b98f3439e33b15bba2036c402f9925340fdb2b9 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 29 Jun 2013 23:23:43 -0700 Subject: Poison std::string and use the various string classes --- src/map/magic.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/map/magic.hpp') diff --git a/src/map/magic.hpp b/src/map/magic.hpp index cec5bf4..5b10367 100644 --- a/src/map/magic.hpp +++ b/src/map/magic.hpp @@ -21,7 +21,7 @@ struct invocation; /* Spell invocation */ * \return 1 or -1 if the input message was magic and was handled by this function, 0 otherwise. -1 is returned when the * message should not be repeated. */ -int magic_message(dumb_ptr caster, const std::string& source_invocation); +int magic_message(dumb_ptr caster, XString source_invocation); /** * Removes the shroud from a character @@ -49,16 +49,16 @@ void do_init_magic(void); /** * Identifies the invocation used to trigger a spell * - * Returns NULL if not found + * Returns empty string if not found */ -const char *magic_find_invocation(const std::string& spellame); +FString magic_find_invocation(XString spellname); /** * Identifies the invocation used to denote a teleport location * - * Returns NULL if not found + * Returns empty string if not found */ -const char *magic_find_anchor_invocation(const std::string& teleport_location); +FString magic_find_anchor_invocation(XString teleport_location); /** * Execute a spell invocation and sets up timers to finish -- cgit v1.2.3-70-g09d2