diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-06-29 23:23:43 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-01 15:19:45 -0700 |
| commit | 3b98f3439e33b15bba2036c402f9925340fdb2b9 (patch) | |
| tree | f6a59330bb747d9cc64f5f83d06e7f76dc01d540 /src/map/magic.hpp | |
| parent | 8d1480c1be7c9741876d89008277a2b3629a4d01 (diff) | |
| download | tmwa-3b98f3439e33b15bba2036c402f9925340fdb2b9.tar.gz tmwa-3b98f3439e33b15bba2036c402f9925340fdb2b9.tar.bz2 tmwa-3b98f3439e33b15bba2036c402f9925340fdb2b9.tar.xz tmwa-3b98f3439e33b15bba2036c402f9925340fdb2b9.zip | |
Poison std::string and use the various string classes
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 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<map_session_data> caster, const std::string& source_invocation); +int magic_message(dumb_ptr<map_session_data> 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 |