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

code review changes

Browse source
This commit is contained in:
Enno Rehling 2014-07-24 08:04:30 +02:00
parent 10e08ab306
commit 955a57273d
2 changed files with 70 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

115
src/kernel/equipment.c
View file

@ -128,65 +128,68 @@ void equip_unit(struct unit *u, const struct equipment *eq)
void equip_unit_mask(struct unit *u, const struct equipment *eq, int mask) void equip_unit_mask(struct unit *u, const struct equipment *eq, int mask)
{ {
if (eq) { if (eq) {
if (mask & EQUIP_SKILLS) { if (mask & EQUIP_SKILLS) {
int sk; int sk;
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) if (i > 0) {
set_level(u, (skill_t)sk, i); set_level(u, (skill_t)sk, i);
} if (sk==SK_STAMINA) {
} u->hp = unit_max_hp(u) * u->number;
u->hp = unit_max_hp(u) * u->number; // Bring the unit to max HitPoints just for the case stamina was changed }
} }
}
if (mask & EQUIP_SPELLS) {
if (eq->spellbook) {
quicklist * ql = eq->spellbook->spells;
int qi;
sc_mage * mage = get_mage(u);
for (qi = 0; ql; ql_advance(&ql, &qi, 1)) {
spellbook_entry *sbe = (spellbook_entry *) ql_get(ql, qi);
unit_add_spell(u, mage, sbe->sp, sbe->level);
}
}
}
if (mask & EQUIP_ITEMS) {
itemdata *idata;
for (idata = eq->items; idata != NULL; idata = idata->next) {
int i = u->number * dice_rand(idata->value);
if (i > 0) {
i_add(&u->items, i_new(idata->itype, i));
}
}
}
if (eq->subsets) {
int i;
for (i = 0; eq->subsets[i].sets; ++i) {
if (chance(eq->subsets[i].chance)) {
float rnd = (1 + rng_int() % 1000) / 1000.0f;
int k;
for (k = 0; eq->subsets[i].sets[k].set; ++k) {
if (rnd <= eq->subsets[i].sets[k].chance) {
equip_unit_mask(u, eq->subsets[i].sets[k].set, mask);
break;
} }
rnd -= eq->subsets[i].sets[k].chance;
}
} }
}
if (mask & EQUIP_SPELLS) {
if (eq->spellbook) {
quicklist * ql = eq->spellbook->spells;
int qi;
sc_mage * mage = get_mage(u);
for (qi = 0; ql; ql_advance(&ql, &qi, 1)) {
spellbook_entry *sbe = (spellbook_entry *) ql_get(ql, qi);
unit_add_spell(u, mage, sbe->sp, sbe->level);
}
}
}
if (mask & EQUIP_ITEMS) {
itemdata *idata;
for (idata = eq->items; idata != NULL; idata = idata->next) {
int i = u->number * dice_rand(idata->value);
if (i > 0) {
i_add(&u->items, i_new(idata->itype, i));
}
}
}
if (eq->subsets) {
int i;
for (i = 0; eq->subsets[i].sets; ++i) {
if (chance(eq->subsets[i].chance)) {
float rnd = (1 + rng_int() % 1000) / 1000.0f;
int k;
for (k = 0; eq->subsets[i].sets[k].set; ++k) {
if (rnd <= eq->subsets[i].sets[k].chance) {
equip_unit_mask(u, eq->subsets[i].sets[k].set, mask);
break;
}
rnd -= eq->subsets[i].sets[k].chance;
}
}
}
}
if (mask & EQUIP_SPECIAL) {
if (eq->callback)
eq->callback(eq, u);
}
} }
if (mask & EQUIP_SPECIAL) {
if (eq->callback)
eq->callback(eq, u);
}
}
} }
void equip_items(struct item **items, const struct equipment *eq) void equip_items(struct item **items, const struct equipment *eq)

20
src/spells/spells.c
View file

@ -3226,16 +3226,18 @@ static int sp_bloodsacrifice(castorder * co)
*/ */
static void skill_summoned(unit * u, int level) static void skill_summoned(unit * u, int level)
{ {
if (level > 0) { if (level > 0) {
const race *rc = u_race(u); const race *rc = u_race(u);
skill_t sk; skill_t sk;
for (sk = 0; sk != MAXSKILLS; ++sk) { for (sk = 0; sk != MAXSKILLS; ++sk) {
if (rc->bonus[sk] > 0) { if (rc->bonus[sk] > 0) {
set_level(u, sk, level); set_level(u, sk, level);
} }
}
if (rc->bonus[SK_STAMINA]) {
u->hp = unit_max_hp(u) * u->number;
}
} }
}
u->hp = unit_max_hp(u) * u->number; // Bring the unit to max HitPoints just for the case stamina was changed
} }
/* ------------------------------------------------------------- */ /* ------------------------------------------------------------- */