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

BUG 2401: fix combat display, again.

This commit is contained in:
Enno Rehling 2018-01-07 17:22:15 +01:00
parent 2cf20dd6e2
commit a48d177472
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/reports.c
View File

@ -2065,12 +2065,12 @@ void report_battle_start(battle * b)
}
}
if (first) {
sbs_strcpy(&sbs, " ");
sbs_strcpy(&sbs, LOC(f->locale, "and"));
sbs_strcpy(&sbs, " ");
sbs_strcat(&sbs, " ");
sbs_strcat(&sbs, LOC(f->locale, "and"));
sbs_strcat(&sbs, " ");
}
if (lastf) {
sbs_strcpy(&sbs, lastf);
sbs_strcat(&sbs, lastf);
}
m = msg_message("start_battle", "factions", zText);

2
src/study.test.c
View File

@ -419,10 +419,8 @@ static void test_study_magic(CuTest *tc) {
static void test_study_cost_magic(CuTest *tc) {
unit * u;
const struct item_type *itype;
test_setup();
itype = test_create_silver();
u = test_create_unit(test_create_faction(0), test_create_region(0, 0, 0));
CuAssertIntEquals(tc, 100, study_cost(u, SK_MAGIC));