oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Settings: Add get_flags API for mapgen flags (mg_flags, mgv6_spflags, ...) (#9284)

Browse source 
Unified flags handling in C++ and Lua Settings API
     -> Reading only, for now. Writing can be implemented later, if needed.
API function to read the currently active flags
     -> was impossible from Lua

Co-authored-by: Wuzzy <wuzzy2@mail.ru>
This commit is contained in:
SmallJoker 2020-01-25 16:56:54 +01:00 • committed by GitHub
parent 9cb3219f34
commit cde2a7f6f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 222 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/unittest/test_settings.cpp
View file

@ -31,6 +31,7 @@ public:
void runTests(IGameDef *gamedef);
void testAllSettings();
void testFlagDesc();
static const char *config_text_before;
static const std::string config_text_after;
@ -41,6 +42,7 @@ static TestSettings g_test_instance;
void TestSettings::runTests(IGameDef *gamedef)
{
TEST(testAllSettings);
TEST(testFlagDesc);
}
////////////////////////////////////////////////////////////////////////////////
@ -206,3 +208,38 @@ void TestSettings::testAllSettings()
UASSERT(!"Setting not found!");
}
}
void TestSettings::testFlagDesc()
{
Settings s;
FlagDesc flagdesc[] = {
{ "biomes", 0x01 },
{ "trees", 0x02 },
{ "jungles", 0x04 },
{ "oranges", 0x08 },
{ "tables", 0x10 },
{ nullptr, 0 }
};
// Enabled: biomes, jungles, oranges (default)
s.setDefault("test_desc", flagdesc, readFlagString(
"biomes,notrees,jungles,oranges", flagdesc, nullptr));
UASSERT(s.getFlagStr("test_desc", flagdesc, nullptr) == (0x01 | 0x04 | 0x08));
// Enabled: jungles, oranges, tables
s.set("test_desc", "nobiomes,tables");
UASSERT(s.getFlagStr("test_desc", flagdesc, nullptr) == (0x04 | 0x08 | 0x10));
// Enabled: (nothing)
s.set("test_desc", "nobiomes,nojungles,nooranges,notables");
UASSERT(s.getFlagStr("test_desc", flagdesc, nullptr) == 0x00);
// Numeric flag tests (override)
// Enabled: trees, tables
s.setDefault("test_flags", flagdesc, 0x02 | 0x10);
UASSERT(s.getFlagStr("test_flags", flagdesc, nullptr) == (0x02 | 0x10));
// Enabled: tables
s.set("test_flags", "16");
UASSERT(s.getFlagStr("test_flags", flagdesc, nullptr) == 0x10);
}