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

use the correct swamp terrain, still failing. newterrain is a plague.

Browse source
This commit is contained in:
Enno Rehling 2017-11-05 16:43:01 +01:00
parent 3fdde8a4aa
commit 2b81334ba2
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/economy.test.c
View file

@ -206,8 +206,9 @@ static void test_trade_insect(CuTest *tc) {
test_setup(); test_setup();
init_resources(); init_resources();
test_create_locale(); test_create_locale();
r = setup_trade_region(tc, test_create_terrain("swamp", LAND_REGION));
init_terrains();
r = setup_trade_region(tc, get_terrain("swamp"));
it_luxury = r_luxury(r); it_luxury = r_luxury(r);
CuAssertPtrNotNull(tc, it_luxury); CuAssertPtrNotNull(tc, it_luxury);
it_silver = get_resourcetype(R_SILVER)->itype; it_silver = get_resourcetype(R_SILVER)->itype;
@ -220,6 +221,7 @@ static void test_trade_insect(CuTest *tc) {
produce(u->region); produce(u->region);
CuAssertIntEquals(tc, 1, get_item(u, it_luxury)); CuAssertIntEquals(tc, 1, get_item(u, it_luxury));
CuAssertIntEquals(tc, 5, get_item(u, it_silver)); CuAssertIntEquals(tc, 5, get_item(u, it_silver));
test_cleanup();
} }
static void test_buy_cmd(CuTest *tc) { static void test_buy_cmd(CuTest *tc) {
@ -231,8 +233,9 @@ static void test_buy_cmd(CuTest *tc) {
test_setup(); test_setup();
init_resources(); init_resources();
test_create_locale(); test_create_locale();
r = setup_trade_region(tc, test_create_terrain("swamp", LAND_REGION));
init_terrains();
r = setup_trade_region(tc, get_terrain("swamp"));
it_luxury = r_luxury(r); it_luxury = r_luxury(r);
CuAssertPtrNotNull(tc, it_luxury); CuAssertPtrNotNull(tc, it_luxury);
rt_silver = get_resourcetype(R_SILVER); rt_silver = get_resourcetype(R_SILVER);

4
src/kernel/terrain.c
View file

@ -132,6 +132,10 @@ const struct terrain_type *newterrain(terrain_t t)
return NULL; return NULL;
assert(t >= 0); assert(t >= 0);
assert(t < MAXTERRAINS); assert(t < MAXTERRAINS);
if (!newterrains[t]) {
log_warning("did you call init_terrains?");
newterrains[t] = get_terrain(terraindata[t]);
}
return newterrains[t]; return newterrains[t];
} }