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

Merge branch 'master' of github.com:badgerman/eressea

This commit is contained in:
Enno Rehling 2014-12-31 21:14:43 +01:00
parent b29a99f9ce f1c6d35fdf
commit b713f650e6
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/kernel/item.test.c
View File

@ -123,15 +123,14 @@ static void test_fix_demand(CuTest *tc) {
region *r; region *r;
terrain_type *tplain; terrain_type *tplain;
item_type *ltype; item_type *ltype;
luxury_type *lux;
test_cleanup(); test_cleanup();
ltype = test_create_itemtype("balm"); ltype = test_create_itemtype("balm");
ltype->rtype->flags |= (RTF_ITEM | RTF_POOLED); ltype->rtype->flags |= (RTF_ITEM | RTF_POOLED);
lux = new_luxurytype(ltype, 0); new_luxurytype(ltype, 0);
ltype = test_create_itemtype("oint"); ltype = test_create_itemtype("oint");
ltype->rtype->flags |= (RTF_ITEM | RTF_POOLED); ltype->rtype->flags |= (RTF_ITEM | RTF_POOLED);
lux = new_luxurytype(ltype, 0); new_luxurytype(ltype, 0);
tplain = test_create_terrain("plain", LAND_REGION); tplain = test_create_terrain("plain", LAND_REGION);
r = new_region(0, 0, NULL, 0); r = new_region(0, 0, NULL, 0);
CuAssertPtrNotNull(tc, r); CuAssertPtrNotNull(tc, r);