summaryrefslogtreecommitdiff
path: root/src/map/magic.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-05-25 13:49:50 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-05-25 13:49:50 -0700
commit1d0e18a186f67844ccd873eabb56ebdaa3f47f11 (patch)
tree94199c6dbcb6b4a86584c303f6e1e72073873f01 /src/map/magic.cpp
parent87218e07b2bc89593eae1cb4abe859cd1a7eaa0f (diff)
downloadtmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.gz
tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.bz2
tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.tar.xz
tmwa-1d0e18a186f67844ccd873eabb56ebdaa3f47f11.zip
Switch block_list and subclasses to dumb_ptr
Now we're well-defined, since we're actually calling ctors and dtors. Most of this code will not survive long ...
Diffstat (limited to 'src/map/magic.cpp')
-rw-r--r--src/map/magic.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/magic.cpp b/src/map/magic.cpp
index 1377979..f6da29b 100644
--- a/src/map/magic.cpp
+++ b/src/map/magic.cpp
@@ -10,7 +10,7 @@
#undef DEBUG
static
-char *magic_preprocess_message(character_t *character, char *start,
+char *magic_preprocess_message(dumb_ptr<map_session_data> character, char *start,
char *end)
{
if (character->state.shroud_active
@@ -56,7 +56,7 @@ char *magic_tokenise(char *src, char **parameter)
return retval;
}
-int magic_message(character_t *caster, char *spell_, size_t)
+int magic_message(dumb_ptr<map_session_data> caster, char *spell_, size_t)
{
if (pc_isdead(caster))
return 0;
@@ -106,7 +106,7 @@ int magic_message(character_t *caster, char *spell_, size_t)
if (effects)
{
- invocation_t *invocation = spell_instantiate(effects, env);
+ dumb_ptr<invocation> invocation = spell_instantiate(effects, env);
spell_bind(caster, invocation);
spell_execute(invocation);