diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:12:07 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2011-09-10 16:12:07 -0700 |
| commit | f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1 (patch) | |
| tree | d9b013ab252968ec1e90e721f7b2ab819af0acb0 /src/map/magic-interpreter-base.c | |
| parent | 5939e1bec75f2550d3ce109b9cd9a5d22c0626c2 (diff) | |
| parent | 723fb5d3431b847526c433a13aa74485cfb564a3 (diff) | |
| download | tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.gz tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.bz2 tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.tar.xz tmwa-f841b6fdcc802e73d52da0e67ee192c0c2c1c7e1.zip | |
Merge commit '723fb5d3431b847526c433a13aa74485cfb564a3'
Diffstat (limited to 'src/map/magic-interpreter-base.c')
| -rw-r--r-- | src/map/magic-interpreter-base.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/map/magic-interpreter-base.c b/src/map/magic-interpreter-base.c index 9d21832..671f962 100644 --- a/src/map/magic-interpreter-base.c +++ b/src/map/magic-interpreter-base.c @@ -143,8 +143,9 @@ teleport_anchor_t *magic_find_anchor (char *name) static env_t *alloc_env (magic_conf_t * conf) { - env_t *env = (env_t *) aCalloc (sizeof (env_t), 1); - env->vars = (val_t *) aCalloc (sizeof (val_t), conf->vars_nr); + env_t *env; + CREATE (env, env_t, 1); + CREATE (env->vars, val_t, conf->vars_nr); env->base_env = conf; return env; } @@ -295,7 +296,7 @@ spellguard_can_satisfy (spellguard_check_t * check, character_t * caster, /* fprintf(stderr, "MC(%d/%s)? %d%d%d%d (%u <= %u)\n", caster->bl.id, caster->status.name, - retval, + retval, caster->cast_tick <= tick, check->mana <= caster->status.sp, check_prerequisites(caster, check->components), @@ -456,8 +457,8 @@ void spell_update_location (invocation_t * invocation) invocation_t *spell_instantiate (effect_set_t * effect_set, env_t * env) { - invocation_t *retval = - (invocation_t *) aCalloc (sizeof (invocation_t), 1); + invocation_t *retval; + CREATE (retval, invocation_t, 1); entity_t *caster; retval->env = env; |