riceball/townforge
1
0
Fork 0
forked from townforge/townforge
Code Issues Pull Requests Projects Releases Wiki Activity

unit_tests: fix build after set_default_palette change

Browse Source
This commit is contained in:
Crypto City 2021-12-02 12:20:11 +00:00
parent 1a840fc4f1
commit d8d45c8fba
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit_tests/cc.cpp
View File

@ -452,7 +452,7 @@ public:
actual_id = *id;
}
std::vector<uint16_t> palette;
cc::set_default_palette(palette, height());
cc::set_default_palette(palette);
state.flags[actual_id] = {true, owner_id, city_id, ROLE_EMPTY, x0, y0, x1, y1, 0, base_height, elevation_bonus, average_slope, south_facing, bridge_score, potential, 0, height(), {}, palette, false, false, 0, "", 0};
return actual_id;
}
@ -2023,7 +2023,7 @@ TEST(cc_command, execute_palette)
palette.palette = {{2, cc::BLOCK_VARIANT_SANDSTONE_COBBLESTONES - cc::BLOCK_VARIANT_GRANITE_BASIC}};
test_commands(true, setup, palette, "good", [](TestDB *db) {
std::vector<uint16_t> default_palette;
cc::set_default_palette(default_palette, 0);
cc::set_default_palette(default_palette);
cryptonote::cc_flag_data_t fd;
ASSERT_TRUE(db->get_cc_flag_data(1 + PREDEFINED_BULDINGS, fd));
ASSERT_EQ(fd.palette.size(), std::max<size_t>(3, default_palette.size()));
@ -2036,7 +2036,7 @@ TEST(cc_command, execute_palette)
palette.palette = {{1, cc::BLOCK_VARIANT_GRANITE_COBBLESTONES - cc::BLOCK_VARIANT_SANDSTONE_BASIC}};
test_commands(true, setup, palette, "good", [](TestDB *db) {
std::vector<uint16_t> default_palette;
cc::set_default_palette(default_palette, 0);
cc::set_default_palette(default_palette);
cryptonote::cc_flag_data_t fd;
ASSERT_TRUE(db->get_cc_flag_data(1 + PREDEFINED_BULDINGS, fd));
ASSERT_EQ(fd.palette.size(), default_palette.size());
@ -2052,7 +2052,7 @@ TEST(cc_command, execute_palette)
palette.palette = {{1, -cc::BLOCK_VARIANT_SANDSTONE_BASIC}};
test_commands(true, setup, palette, "good", [](TestDB *db) {
std::vector<uint16_t> default_palette;
cc::set_default_palette(default_palette, 0);
cc::set_default_palette(default_palette);
cryptonote::cc_flag_data_t fd;
ASSERT_TRUE(db->get_cc_flag_data(1 + PREDEFINED_BULDINGS, fd));
ASSERT_EQ(fd.palette.size(), default_palette.size());