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

two little remarks

This commit is contained in:
Enno Rehling 2011-03-06 11:31:12 +01:00
parent 623c0dce84
commit d672510f06
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/kernel/battle.c
View File

@ -2224,6 +2224,7 @@ attack(battle *b, troop ta, const att *a, int numattack)
combat_action(ta.fighter, b->turn); combat_action(ta.fighter, b->turn);
} }
if (td.fighter->unit->ship) { if (td.fighter->unit->ship) {
/* FIXME should use damage_ship here? */
td.fighter->unit->ship->damage += DAMAGE_SCALE * dice_rand(a->data.dice); td.fighter->unit->ship->damage += DAMAGE_SCALE * dice_rand(a->data.dice);
} else if (td.fighter->unit->building) { } else if (td.fighter->unit->building) {
damage_building(b, td.fighter->unit->building, dice_rand(a->data.dice)); damage_building(b, td.fighter->unit->building, dice_rand(a->data.dice));

2
src/util/language.c
View File

@ -197,7 +197,7 @@ locale_setstring(locale * lang, const char * key, const char * value)
} }
else { else {
if (strcmp(find->str, value)!=0) { 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"); assert(!strcmp(find->str, value) || !"duplicate string for key");
} }