1
0

merge master

This commit is contained in:
Tycho
2014-06-14 17:19:28 +01:00
194 changed files with 25399 additions and 2293 deletions

View File

@@ -1,5 +1,5 @@
#include "TestGlobals.h"
#include "Globals.h"
#include "ChunkData.h"
@@ -117,14 +117,14 @@ int main(int argc, char** argv)
// Zero's
buffer.SetBlock(0, 0, 0, 0x0);
buffer.SetBlock(0, 0, 1, 0xAB);
buffer.SetBlock(0, 0, 1, 0xab);
testassert(buffer.GetBlock(0, 0, 0) == 0x0);
testassert(buffer.GetBlock(0, 0, 1) == 0xAB);
testassert(buffer.GetBlock(0, 0, 1) == 0xab);
buffer.SetMeta(0, 16, 0, 0x0);
buffer.SetMeta(0, 16, 1, 0xC);
buffer.SetMeta(0, 16, 1, 0xc);
testassert(buffer.GetMeta(0, 16, 0) == 0x0);
testassert(buffer.GetMeta(0, 16, 1) == 0xC);
testassert(buffer.GetMeta(0, 16, 1) == 0xc);
}