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

Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2018-12-09 10:27:53 +01:00
parent e47da17cc6 9ae603803f
commit c815916fda
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/tests/e2/undead.lua
View File

@ -19,7 +19,7 @@ function test_undead_reserve_self()
assert_equal(1, u1:get_item("log"))
end
function test_undead_reserve_other()
function skip_undead_reserve_other()
local r1 = region.create(0, 0, "plain")
local f1 = faction.create("human")
local u1 = unit.create(f1, r1, 1)

4
src/battle.c
View File

@ -1187,7 +1187,7 @@ static void destroy_items(troop dt) {
}
static void calculate_defense_type(troop dt, troop at, int type, bool missile,
static void calculate_defense_type(troop at, troop dt, int type, bool missile,
const weapon_type **dwtype, int *defskill) {
const weapon *weapon;
weapon = select_weapon(dt, false, true); /* missile=true to get the unmodified best weapon she has */
@ -1196,7 +1196,7 @@ static void calculate_defense_type(troop dt, troop at, int type, bool missile,
*dwtype = weapon->type;
}
static void calculate_attack_type(troop dt, troop at, int type, bool missile,
static void calculate_attack_type(troop at, troop dt, int type, bool missile,
const weapon_type **awtype, int *attskill, bool *magic) {
const weapon *weapon;