moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-12-22 07:38:48 -05:00
Code Issues Releases Wiki Activity

Update minetestmapper.py to support ver. 24 and 25

Browse Source
This commit is contained in:
Perttu Ahola 2012-07-24 15:16:49 +03:00
parent 5c31445117
commit 558e284e25
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/minetestmapper.py
View File

@ -324,7 +324,9 @@ def content_is_air(d):
return d in [126, 127, 254, "air"] return d in [126, 127, 254, "air"]
def read_content(mapdata, version, datapos): def read_content(mapdata, version, datapos):
if version >= 20: if version >= 24:
return (mapdata[datapos*2] << 8) | (mapdata[datapos*2 + 1])
elif version >= 20:
if mapdata[datapos] < 0x80: if mapdata[datapos] < 0x80:
return mapdata[datapos] return mapdata[datapos]
else: else:
@ -387,6 +389,7 @@ def read_mapdata(mapdata, version, pixellist, water, day_night_differs, id_to_na
#print("unknown node: %s/%s/%s x: %d y: %d z: %d block id: %x" #print("unknown node: %s/%s/%s x: %d y: %d z: %d block id: %x"
# % (xhex, zhex, yhex, x, y, z, content)) # % (xhex, zhex, yhex, x, y, z, content))
# Go through all sectors. # Go through all sectors.
for n in range(len(xlist)): for n in range(len(xlist)):
#if n > 500: #if n > 500:
@ -546,6 +549,14 @@ for n in range(len(xlist)):
if version == 23: if version == 23:
readU8(f) # Unused node timer version (always 0) readU8(f) # Unused node timer version (always 0)
if version == 24:
ver = readU8(f)
if ver == 1:
num = readU16(f)
for i in range(0,num):
readU16(f)
readS32(f)
readS32(f)
static_object_version = readU8(f) static_object_version = readU8(f)
static_object_count = readU16(f) static_object_count = readU16(f)
@ -578,6 +589,15 @@ for n in range(len(xlist)):
#print(str(node_id)+" = "+name) #print(str(node_id)+" = "+name)
id_to_name[node_id] = name id_to_name[node_id] = name
# Node timers
if version >= 25:
timer_size = readU8(f)
num = readU16(f)
for i in range(0,num):
readU16(f)
readS32(f)
readS32(f)
read_mapdata(mapdata, version, pixellist, water, day_night_differs, id_to_name) read_mapdata(mapdata, version, pixellist, water, day_night_differs, id_to_name)
# After finding all the pixels in the sector, we can move on to # After finding all the pixels in the sector, we can move on to