Fix getting MapBlocks for abs(z) > 2048 with sqlite3 backend (fixed #31)

sfan5 · sfan5 · commit 4db3040f2abb · 2016-09-18T14:33:13.000+02:00
diff --git a/db-sqlite3.cpp b/db-sqlite3.cpp
@@ -62,8 +62,8 @@ void DBSQLite3::getBlocksOnZ(std::map<int16_t, BlockList> &blocks, int16_t zPos)
 	int result;
 
 	// Magic numbers!
-	int64_t minPos = (zPos * 0x1000000) - 0x800000;
-	int64_t maxPos = (zPos * 0x1000000) + 0x7FFFFF;
+	int64_t minPos = encodeBlockPos(BlockPos(0, -2048, zPos));
+	int64_t maxPos = encodeBlockPos(BlockPos(0, 2048, zPos)) - 1;
 
 	SQLOK(bind_int64(stmt_get_blocks_z, 1, minPos));
 	SQLOK(bind_int64(stmt_get_blocks_z, 2, maxPos));
diff --git a/db.h b/db.h
@@ -16,6 +16,8 @@ class BlockPos {
 	int16_t y;
 	int16_t z;
 
+	BlockPos() : x(0), y(0), z(0) {}
+	BlockPos(int16_t x, int16_t y, int16_t z) : x(x), y(y), z(z) {}
 	bool operator < (const BlockPos &p) const
 	{
 		if (z > p.z) {

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@ class BlockPos {`
`16`	`16`	`int16_t y;`
`17`	`17`	`int16_t z;`
`18`	`18`
	`19`	`+ BlockPos() : x(0), y(0), z(0) {}`
	`20`	`+ BlockPos(int16_t x, int16_t y, int16_t z) : x(x), y(y), z(z) {}`
`19`	`21`	`bool operator < (const BlockPos &p) const`
`20`	`22`	`{`
`21`	`23`	`if (z > p.z) {`