diff --git a/src/kernel/battle.c b/src/kernel/battle.c index 579838ed1..a6fa318de 100644 --- a/src/kernel/battle.c +++ b/src/kernel/battle.c @@ -2224,6 +2224,7 @@ attack(battle *b, troop ta, const att *a, int numattack) combat_action(ta.fighter, b->turn); } if (td.fighter->unit->ship) { + /* FIXME should use damage_ship here? */ td.fighter->unit->ship->damage += DAMAGE_SCALE * dice_rand(a->data.dice); } else if (td.fighter->unit->building) { damage_building(b, td.fighter->unit->building, dice_rand(a->data.dice)); diff --git a/src/util/language.c b/src/util/language.c index 298cf92b0..707928677 100644 --- a/src/util/language.c +++ b/src/util/language.c @@ -197,7 +197,7 @@ locale_setstring(locale * lang, const char * key, const char * value) } else { if (strcmp(find->str, value)!=0) { - log_error(("Duplicate key %s for '%s' and '%s'\n", key, value, find->str)); + log_error(("Duplicate values '%s' and '%s' for %s\n", value, find->str, key)); } assert(!strcmp(find->str, value) || !"duplicate string for key"); }