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

Merge branch 'master' of github.com:badgerman/eressea

This commit is contained in:
Enno Rehling 2014-11-11 17:22:44 +01:00
parent 5b9eb9080f b8306d42f5
commit 691b81e086
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/battle.c
View File

@ -133,7 +133,6 @@ static int skill_formula = 0;
#define DAMAGE_CRITICAL (1<<0)
#define DAMAGE_MELEE_BONUS (1<<1)
#define DAMAGE_MISSILE_BONUS (1<<2)
#define DAMAGE_UNARMED_BONUS (1<<3)
#define DAMAGE_SKILL_BONUS (1<<4)
/** initialize rules from configuration.
*/
@ -159,9 +158,6 @@ static void static_rules(void)
if (get_param_int(global.parameters, "rules.combat.missile_bonus", 1)) {
damage_rules |= DAMAGE_MISSILE_BONUS;
}
if (get_param_int(global.parameters, "rules.combat.unarmed_bonus", 1)) {
damage_rules |= DAMAGE_UNARMED_BONUS;
}
if (get_param_int(global.parameters, "rules.combat.skill_bonus", 1)) {
damage_rules |= DAMAGE_SKILL_BONUS;
}
@ -1207,12 +1203,6 @@ terminate(troop dt, troop at, int type, const char *damage, bool missile)
da += af->person[at.index].damage_rear;
}
}
else if (awtype == NULL) {
/* skill bonus for unarmed combat */
if (damage_rules & DAMAGE_UNARMED_BONUS) {
da += effskill(au, SK_WEAPONLESS);
}
}
else {
/* melee bonus */
if (damage_rules & DAMAGE_MELEE_BONUS) {