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

fix merge error

Browse source
This commit is contained in:
Enno Rehling 2019-02-03 04:17:11 +01:00
parent 818b309ebf
commit e2607a3e7c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/battle.c
View file

@ -600,7 +600,7 @@ weapon_skill(const weapon_type * wtype, const unit * u, bool attacking)
/* wenn kein waffenloser kampf, dann den rassen-defaultwert */ /* wenn kein waffenloser kampf, dann den rassen-defaultwert */
if (rc == get_race(RC_ORC)) { if (rc == get_race(RC_ORC)) {
int sword = effskill(u, SK_MELEE, NULL); int sword = effskill(u, SK_MELEE, NULL);
int spear = effskill(u, SK_SPEAR,NULL0); int spear = effskill(u, SK_SPEAR, NULL);
skill = ((sword > spear) ? sword : spear) - 3; skill = ((sword > spear) ? sword : spear) - 3;
} }
} }