Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix processing of blocks below y=0 in sectors2sqlite.py.

Browse Source
This commit is contained in:
Kahrl 2011-09-26 13:10:22 +02:00
parent bdf54908aa
commit d5899a53fd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/sectors2sqlite.py
View File

@ -23,10 +23,14 @@ if os.path.isdir(path + 'sectors/'):
if not paths: if not paths:
exit('Could not find sectors folder at ' + path + 'sectors2/ or ' + path + 'sectors/') exit('Could not find sectors folder at ' + path + 'sectors2/ or ' + path + 'sectors/')
def uint(u): def parseSigned12bit(u):
u = int('0x'+u, 16) u = int('0x'+u, 16)
return (u if u < 2**11 else u - 2**12) return (u if u < 2**11 else u - 2**12)
def parseSigned16bit(u):
u = int('0x'+u, 16)
return (u if u < 2**15 else u - 2**16)
def int64(u): def int64(u):
while u >= 2**63: while u >= 2**63:
u -= 2**64 u -= 2**64
@ -38,12 +42,12 @@ def int64(u):
def getSectorPos(dirname): def getSectorPos(dirname):
if len(dirname) == 8: if len(dirname) == 8:
# Old layout # Old layout
x = uint(dirname[:4]) x = parseSigned16bit(dirname[:4])
z = uint(dirname[4:]) z = parseSigned16bit(dirname[4:])
elif len(dirname) == 7: elif len(dirname) == 7:
# New layout # New layout
x = uint(dirname[:3]) x = parseSigned12bit(dirname[:3])
z = uint(dirname[4:]) z = parseSigned12bit(dirname[4:])
else: else:
print('Terrible sector at ' + dirname) print('Terrible sector at ' + dirname)
return return
@ -60,7 +64,7 @@ def getBlockPos(sectordir, blockfile):
if len(blockfile) != 4: if len(blockfile) != 4:
print("Invalid block filename: " + blockfile) print("Invalid block filename: " + blockfile)
y = uint(blockfile) y = parseSigned16bit(blockfile)
return p2d[0], y, p2d[1] return p2d[0], y, p2d[1]