diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-11 21:55:13 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-11 23:27:33 -0700 |
commit | 8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13 (patch) | |
tree | 15e8a4841af992e17794f26fc7991ed40c35bd51 /src/map/magic.hpp | |
parent | 8c6072df499ef9068346fbe8313b63dbba1e4e82 (diff) | |
download | tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.gz tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.bz2 tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.tar.xz tmwa-8b5370313dcc00a45ea5c3e8b4c497bc00fd8e13.zip |
Allegedly remove all manual memory management
Diffstat (limited to 'src/map/magic.hpp')
-rw-r--r-- | src/map/magic.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/magic.hpp b/src/map/magic.hpp index cc66eb4..cec5bf4 100644 --- a/src/map/magic.hpp +++ b/src/map/magic.hpp @@ -14,14 +14,14 @@ struct invocation; /* Spell invocation */ * Try to cast magic. * * As an intended side effect, the magic message may be distorted (text only). + * No, it can't. Thank God. * * \param caster Player attempting to cast magic - * \param spell The prospective incantation - * \param spell_len Number of characters in the incantation + * \param source_invocation The prospective incantation * \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<map_session_data> caster, char *spell, size_t spell_len); +int magic_message(dumb_ptr<map_session_data> caster, const std::string& source_invocation); /** * Removes the shroud from a character @@ -51,14 +51,14 @@ void do_init_magic(void); * * Returns NULL if not found */ -const char *magic_find_invocation(const char *spellame); +const char *magic_find_invocation(const std::string& spellame); /** * Identifies the invocation used to denote a teleport location * * Returns NULL if not found */ -const char *magic_find_anchor_invocation(const char *teleport_location); +const char *magic_find_anchor_invocation(const std::string& teleport_location); /** * Execute a spell invocation and sets up timers to finish |