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

Merge branch 'develop' of https://github.com/ennorehling/eressea.git

This commit is contained in:
Enno Rehling 2016-09-17 20:05:31 +02:00
parent 3262fdecd4 a425a78f7c
commit 196c3b7ac8
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -26,12 +26,6 @@ ipch/
*.bak *.bak
bin/ bin/
build*/ build*/
game-e2/data
game-e2/*.log*
game-e2/reports/
game-e3/data/
game-e3/*.log*
game-e3/reports/
*.log *.log
*.log.* *.log.*
tags tags

3
src/lighthouse.test.c
View File

@ -18,12 +18,11 @@ static void test_lighthouse_range(CuTest * tc)
{ {
faction *f; faction *f;
unit *u; unit *u;
region *r1, *r2; region *r1;
building *b; building *b;
test_setup(); test_setup();
r1 = test_create_region(0, 0, 0); r1 = test_create_region(0, 0, 0);
r2 = test_create_region(1, 0, 0);
f = test_create_faction(0); f = test_create_faction(0);
u = test_create_unit(f, r1); u = test_create_unit(f, r1);
b = test_create_building(r1, test_create_buildingtype("lighthouse")); b = test_create_building(r1, test_create_buildingtype("lighthouse"));

BIN
tests/data/184.dat
View File

Binary file not shown.