Marc/server
1
0
Fork 0
forked from github/server
Code Issues Pull requests Projects Releases Wiki Activity

new_castorder is history

Browse source
This commit is contained in:
Enno Rehling 2012-05-09 18:42:20 -07:00
parent 67ef4c52a3
commit ee7a35f293
3 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/kernel/battle.c
View file

@ -1765,7 +1765,8 @@ void do_combatmagic(battle * b, combatmagic_t was)
report_failed_spell(b, mage, sp); report_failed_spell(b, mage, sp);
pay_spell(mage, sp, level, 1); pay_spell(mage, sp, level, 1);
} else { } else {
co = new_castorder(fig, 0, sp, r, level, power, 0, 0, 0); co = create_castorder(0, fig->unit, 0, sp, r, level, power, 0, 0, 0);
co->magician.fig = fig;
add_castorder(&spellranks[sp->rank], co); add_castorder(&spellranks[sp->rank], co);
} }
} }

30
src/kernel/magic.c
View file

@ -2095,25 +2095,6 @@ struct region * co_get_region(struct castorder * co) {
return co->_rtarget; return co->_rtarget;
} }
castorder *new_castorder(void *caster, unit * familiar, const spell * sp, region * r,
int lev, double force, int range, struct order * ord, spellparameter * p)
{
castorder *corder = (castorder*)calloc(1, sizeof(castorder));
unit * u = (unit *)caster;
corder->magician.u = u;
corder->_familiar = familiar;
corder->sp = sp;
corder->level = lev;
corder->force = force;
corder->_rtarget = r ? r : (familiar ? familiar->region : (u ? u->region : 0));
corder->distance = range;
corder->order = copy_order(ord);
corder->par = p;
return corder;
}
castorder *create_castorder(castorder * co, unit *caster, unit * familiar, const spell * sp, region * r, castorder *create_castorder(castorder * co, unit *caster, unit * familiar, const spell * sp, region * r,
int lev, double force, int range, struct order * ord, spellparameter * p) int lev, double force, int range, struct order * ord, spellparameter * p)
{ {
@ -2134,7 +2115,8 @@ castorder *create_castorder(castorder * co, unit *caster, unit * familiar, const
void free_castorder(struct castorder *co) void free_castorder(struct castorder *co)
{ {
free_order(co->order); if (co->par) free_spellparameter(co->par);
if (co->order) free_order(co->order);
} }
/* Hänge c-order co an die letze c-order von cll an */ /* Hänge c-order co an die letze c-order von cll an */
@ -2157,11 +2139,7 @@ void free_castorders(castorder * co)
while (co) { while (co) {
co2 = co; co2 = co;
co = co->next; co = co->next;
if (co2->par) { free_castorder(co2);
free_spellparameter(co2->par);
}
if (co2->order)
free_order(co2->order);
free(co2); free(co2);
} }
return; return;
@ -2758,7 +2736,7 @@ static castorder *cast_cmd(unit * u, order * ord)
return 0; return 0;
} }
} }
return new_castorder(caster, familiar, sp, target_r, level, 0, range, ord, return create_castorder(0, caster, familiar, sp, target_r, level, 0, range, ord,
args); args);
} }

3
src/kernel/magic.h
View file

@ -310,9 +310,6 @@ typedef struct sc_mage {
struct castorder **end; struct castorder **end;
} spellrank; } spellrank;
struct castorder *new_castorder(void *u, struct unit *familiar, const spell * sp,
struct region *r, int lev, double force, int distance, struct order *ord,
spellparameter * p);
struct castorder *create_castorder(struct castorder * co, struct unit *caster, struct castorder *create_castorder(struct castorder * co, struct unit *caster,
struct unit * familiar, const struct spell * sp, struct region * r, struct unit * familiar, const struct spell * sp, struct region * r,
int lev, double force, int range, struct order * ord, struct spellparameter * p); int lev, double force, int range, struct order * ord, struct spellparameter * p);