A few item and node definitions for those tests that need them
*/
-#define CONTENT_STONE 0
-#define CONTENT_GRASS 0x800
-#define CONTENT_TORCH 100
+static content_t CONTENT_STONE;
+static content_t CONTENT_GRASS;
+static content_t CONTENT_TORCH;
void define_some_nodes(IWritableItemDefManager *idef, IWritableNodeDefManager *ndef)
{
- content_t i;
ItemDefinition itemdef;
ContentFeatures f;
/*
Stone
*/
- i = CONTENT_STONE;
itemdef = ItemDefinition();
itemdef.type = ITEM_NODE;
itemdef.name = "default:stone";
f.tiledef[i].name = "default_stone.png";
f.is_ground_content = true;
idef->registerItem(itemdef);
- ndef->set(i, f);
+ CONTENT_STONE = ndef->set(f.name, f);
/*
Grass
*/
- i = CONTENT_GRASS;
itemdef = ItemDefinition();
itemdef.type = ITEM_NODE;
itemdef.name = "default:dirt_with_grass";
f.tiledef[i].name = "default_dirt.png^default_grass_side.png";
f.is_ground_content = true;
idef->registerItem(itemdef);
- ndef->set(i, f);
+ CONTENT_GRASS = ndef->set(f.name, f);
/*
Torch (minimal definition for lighting tests)
*/
- i = CONTENT_TORCH;
itemdef = ItemDefinition();
itemdef.type = ITEM_NODE;
itemdef.name = "default:torch";
f.sunlight_propagates = true;
f.light_source = LIGHT_MAX-1;
idef->registerItem(itemdef);
- ndef->set(i, f);
+ CONTENT_TORCH = ndef->set(f.name, f);
}
struct TestBase
UASSERT(fabs(wrapDegrees(-0.5) - (-0.5)) < 0.001);
UASSERT(fabs(wrapDegrees(-365.5) - (-5.5)) < 0.001);
UASSERT(lowercase("Foo bAR") == "foo bar");
+ UASSERT(trim("\n \t\r Foo bAR \r\n\t\t ") == "Foo bAR");
+ UASSERT(trim("\n \t\r \r\n\t\t ") == "");
UASSERT(is_yes("YeS") == true);
UASSERT(is_yes("") == false);
UASSERT(is_yes("FAlse") == false);
fromdata[3]=1;
std::ostringstream os(std::ios_base::binary);
- compress(fromdata, os, SER_FMT_VER_HIGHEST);
+ compress(fromdata, os, SER_FMT_VER_HIGHEST_READ);
std::string str_out = os.str();
std::istringstream is(str_out, std::ios_base::binary);
std::ostringstream os2(std::ios_base::binary);
- decompress(is, os2, SER_FMT_VER_HIGHEST);
+ decompress(is, os2, SER_FMT_VER_HIGHEST_READ);
std::string str_out2 = os2.str();
infostream<<"decompress: ";