mirror of
https://github.com/minetest/minetest.git
synced 2024-08-18 20:44:16 +02:00
Fix processing of blocks below y=0 in sectors2sqlite.py.
This commit is contained in:
parent
bdf54908aa
commit
d5899a53fd
@ -23,10 +23,14 @@ if os.path.isdir(path + 'sectors/'):
|
||||
if not paths:
|
||||
exit('Could not find sectors folder at ' + path + 'sectors2/ or ' + path + 'sectors/')
|
||||
|
||||
def uint(u):
|
||||
def parseSigned12bit(u):
|
||||
u = int('0x'+u, 16)
|
||||
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):
|
||||
while u >= 2**63:
|
||||
u -= 2**64
|
||||
@ -38,12 +42,12 @@ def int64(u):
|
||||
def getSectorPos(dirname):
|
||||
if len(dirname) == 8:
|
||||
# Old layout
|
||||
x = uint(dirname[:4])
|
||||
z = uint(dirname[4:])
|
||||
x = parseSigned16bit(dirname[:4])
|
||||
z = parseSigned16bit(dirname[4:])
|
||||
elif len(dirname) == 7:
|
||||
# New layout
|
||||
x = uint(dirname[:3])
|
||||
z = uint(dirname[4:])
|
||||
x = parseSigned12bit(dirname[:3])
|
||||
z = parseSigned12bit(dirname[4:])
|
||||
else:
|
||||
print('Terrible sector at ' + dirname)
|
||||
return
|
||||
@ -60,7 +64,7 @@ def getBlockPos(sectordir, blockfile):
|
||||
if len(blockfile) != 4:
|
||||
print("Invalid block filename: " + blockfile)
|
||||
|
||||
y = uint(blockfile)
|
||||
y = parseSigned16bit(blockfile)
|
||||
|
||||
return p2d[0], y, p2d[1]
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user