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 2017-05-26 06:27:31 +02:00
parent 8e15487a1e a3f655f322
commit b0b9eec05d
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/kernel/building.c
View File

@ -75,15 +75,16 @@ static building_type *bt_find_i(const char *name)
if (match) { if (match) {
cb_get_kv(match, &btype, sizeof(btype)); cb_get_kv(match, &btype, sizeof(btype));
} }
else {
log_warning("st_find: could not find ship '%s'\n", name);
}
return btype; return btype;
} }
const building_type *bt_find(const char *name) const building_type *bt_find(const char *name)
{ {
return bt_find_i(name); building_type *btype = bt_find_i(name);
if (!btype) {
log_warning("bt_find: could not find building '%s'\n", name);
}
return btype;
} }
static int bt_changes = 1; static int bt_changes = 1;

9
src/kernel/ship.c
View File

@ -97,14 +97,15 @@ static ship_type *st_find_i(const char *name)
if (match) { if (match) {
cb_get_kv(match, &st, sizeof(st)); cb_get_kv(match, &st, sizeof(st));
} }
else {
log_warning("st_find: could not find ship '%s'\n", name);
}
return st; return st;
} }
const ship_type *st_find(const char *name) { const ship_type *st_find(const char *name) {
return st_find_i(name); ship_type *st = st_find_i(name);
if (!st) {
log_warning("st_find: could not find ship '%s'\n", name);
}
return st;
} }
static void st_register(ship_type *stype) { static void st_register(ship_type *stype) {

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;