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

Merge branch 'feature/refactor-rcspell' of https://github.com/ennorehling/eressea.git

This commit is contained in:
Enno Rehling 2017-05-22 21:16:34 +02:00
parent 51f8f87072 0755830754
commit 1bb022ef58
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/laws.test.c
View File

@ -1446,10 +1446,6 @@ static void test_show_both(CuTest *tc) {
test_cleanup(); test_cleanup();
} }
static int low_wage(const region * r, const faction * f, const race * rc, int in_turn) {
return 1;
}
static void test_immigration(CuTest * tc) static void test_immigration(CuTest * tc)
{ {
region *r; region *r;

6
src/reports.test.c
View File

@ -715,16 +715,14 @@ static void test_region_distance_ql(CuTest *tc) {
} }
static void test_report_far_vision(CuTest *tc) { static void test_report_far_vision(CuTest *tc) {
unit *u1;
faction *f; faction *f;
region *r1, *r2; region *r1, *r2;
const race *rc;
test_setup(); test_setup();
f = test_create_faction(0); f = test_create_faction(0);
r1 = test_create_region(0, 0, 0); r1 = test_create_region(0, 0, 0);
u1 = test_create_unit(f, r1); test_create_unit(f, r1);
r2 = test_create_region(10, 0, 0); r2 = test_create_region(10, 0, 0);
rc = test_create_race("spell"); test_create_race("spell");
set_observer(r2, f, 10); set_observer(r2, f, 10);
CuAssertPtrEquals(tc, r1, f->first); CuAssertPtrEquals(tc, r1, f->first);
CuAssertPtrEquals(tc, r2, f->last); CuAssertPtrEquals(tc, r2, f->last);