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

http://eressea.upb.de/mantis/view.php?id=845 

- cry havoc when trying to apply spells to a non-mage.
This commit is contained in:
Enno Rehling 2006-02-26 13:14:46 +00:00
parent caab8471ed
commit c78f64de00
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/kernel/equipment.c
View File

@ -31,6 +31,7 @@
#include <util/rng.h> #include <util/rng.h>
/* libc includes */ /* libc includes */
#include <assert.h>
#include <string.h> #include <string.h>
static equipment * equipment_sets; static equipment * equipment_sets;
@ -118,26 +119,34 @@ equip_unit(struct unit * u, const struct equipment * eq)
if (eq) { if (eq) {
skill_t sk; skill_t sk;
itemdata * idata; itemdata * idata;
sc_mage * m = get_mage(u);
if (m!=NULL) {
spell_list * sp = eq->spells; spell_list * sp = eq->spells;
while (sp) {
add_spell(m, sp->data);
sp = sp->next;
}
}
for (sk=0;sk!=MAXSKILLS;++sk) { for (sk=0;sk!=MAXSKILLS;++sk) {
if (eq->skills[sk]!=NULL) { if (eq->skills[sk]!=NULL) {
int i = dice_rand(eq->skills[sk]); int i = dice_rand(eq->skills[sk]);
if (i>0) set_level(u, sk, i); if (i>0) set_level(u, sk, i);
} }
} }
if (sp!=NULL) {
sc_mage * m = get_mage(u);
if (m==NULL) {
assert(!"trying to equip spells on a non-mage!");
} else {
while (sp) {
add_spell(m, sp->data);
sp = sp->next;
}
}
}
for (idata=eq->items;idata!=NULL;idata=idata->next) { for (idata=eq->items;idata!=NULL;idata=idata->next) {
int i = u->number * dice_rand(idata->value); int i = u->number * dice_rand(idata->value);
if (i>0) { if (i>0) {
i_add(&u->items, i_new(idata->itype, i)); i_add(&u->items, i_new(idata->itype, i));
} }
} }
if (eq->subsets) { if (eq->subsets) {
int i; int i;
for (i=0;eq->subsets[i].sets;++i) { for (i=0;eq->subsets[i].sets;++i) {