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

bug 2678: fix trade_needs_castle 

The logic for "insects do not need castles in deserts or swamps" was broken.
This commit is contained in:
Enno Rehling 2020-07-04 11:48:24 +02:00
parent c35ba4cf92
commit 183981f3c7
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/economy.c
View File

@ -1175,11 +1175,14 @@ bool trade_needs_castle(const terrain_type *terrain, const race *rc)
if (rc_changed(&rc_change)) { if (rc_changed(&rc_change)) {
rc_insect = get_race(RC_INSECT); rc_insect = get_race(RC_INSECT);
} }
if (rc != rc_insect) {
return true;
}
if (terrain_changed(&terrain_change)) { if (terrain_changed(&terrain_change)) {
t_swamp = newterrain(T_SWAMP); t_swamp = newterrain(T_SWAMP);
t_desert = newterrain(T_DESERT); t_desert = newterrain(T_DESERT);
} }
return rc != rc_insect && (terrain == t_swamp || terrain == t_desert); return (terrain != t_swamp && terrain != t_desert);
} }
static building * first_building(region *r, const struct building_type *btype, int minsize) { static building * first_building(region *r, const struct building_type *btype, int minsize) {

13
src/economy.test.c
View File

@ -269,7 +269,7 @@ static void test_trade_needs_castle(CuTest *tc) {
region *r; region *r;
unit *u; unit *u;
building *b; building *b;
const terrain_type *t_swamp; const terrain_type *t_swamp, *t_desert, *t_plain;
const item_type *it_luxury; const item_type *it_luxury;
test_setup(); test_setup();
@ -278,11 +278,15 @@ static void test_trade_needs_castle(CuTest *tc) {
setup_terrains(tc); setup_terrains(tc);
init_terrains(); init_terrains();
t_swamp = get_terrain("swamp"); t_swamp = get_terrain("swamp");
r = setup_trade_region(tc, t_swamp); t_desert = get_terrain("desert");
t_plain = get_terrain("plain");
r = setup_trade_region(tc, t_plain);
it_luxury = r_luxury(r); it_luxury = r_luxury(r);
rc = test_create_race(NULL); rc = test_create_race(NULL);
CuAssertTrue(tc, trade_needs_castle(t_swamp, rc)); CuAssertTrue(tc, trade_needs_castle(t_swamp, rc));
CuAssertTrue(tc, trade_needs_castle(t_desert, rc));
CuAssertTrue(tc, trade_needs_castle(t_plain, rc));
u = test_create_unit(test_create_faction(rc), r); u = test_create_unit(test_create_faction(rc), r);
unit_addorder(u, create_order(K_BUY, u->faction->locale, "1 %s", unit_addorder(u, create_order(K_BUY, u->faction->locale, "1 %s",
@ -305,6 +309,11 @@ static void test_trade_needs_castle(CuTest *tc) {
test_clear_messages(u->faction); test_clear_messages(u->faction);
produce(r); produce(r);
CuAssertIntEquals(tc, 0, test_count_messagetype(u->faction->msgs, "error119")); CuAssertIntEquals(tc, 0, test_count_messagetype(u->faction->msgs, "error119"));
rc = test_create_race("insect");
CuAssertTrue(tc, !trade_needs_castle(t_swamp, rc));
CuAssertTrue(tc, !trade_needs_castle(t_desert, rc));
CuAssertTrue(tc, trade_needs_castle(t_plain, rc));
test_teardown(); test_teardown();
} }