Debug de ExtraData 2.0

This commit is contained in:
attilavs2 2024-07-28 21:04:26 +02:00
parent dae4bd8a55
commit 82a519659d
3 changed files with 19 additions and 8 deletions

View file

@ -28,8 +28,6 @@ def convert(input, output, params, target):
else: else:
return 1 return 1
def convert_world(input, output, params, target): def convert_world(input, output, params, target):
print( "WE ARE COMPUTING THE WORLD", input ) print( "WE ARE COMPUTING THE WORLD", input )
@ -39,6 +37,7 @@ def convert_world(input, output, params, target):
if DEBUG: print( "So let's go ... ") if DEBUG: print( "So let's go ... ")
structWorld = fxconv.Structure() structWorld = fxconv.Structure()
structWorld += fxconv.string("DEBUG")
#structExtra = fxconv.Structure() #structExtra = fxconv.Structure()
for i in range(nbMaps): for i in range(nbMaps):
@ -75,6 +74,7 @@ def convert_world(input, output, params, target):
structWorld += fxconv.ptr( map ) structWorld += fxconv.ptr( map )
structWorld += fxconv.u32(0) structWorld += fxconv.u32(0)
structWorld += fxconv.string("DEBUG")
#generate ! #generate !
fxconv.elf(structWorld, output, "_" + params["name"], **target) fxconv.elf(structWorld, output, "_" + params["name"], **target)
@ -401,14 +401,25 @@ def get_extra_map_data(input, output, params, target, xmin, ymin, xmax, ymax):
#else we do nothing #else we do nothing
else: else:
print( "Unknown object type !" ) print( 'Unknown object type "'+tpe+'" !' )
structData += fxconv.u32(nbNPC) structData += fxconv.u32(nbNPC)
structData += fxconv.ptr(npcs) if nbNPC:
structData += fxconv.ptr(npcs)
else:
structData += fxconv.u32(0)
structData += fxconv.u32(nbSign) structData += fxconv.u32(nbSign)
structData += fxconv.ptr(signs) if nbSign:
structData += fxconv.ptr(signs)
else:
structData += fxconv.u32(0)
structData += fxconv.u32(nbPortal) structData += fxconv.u32(nbPortal)
structData += fxconv.ptr(portals) if nbPortal:
structData += fxconv.ptr(portals)
else:
structData += fxconv.u32(0)
return nbDiag, structData return nbDiag, structData

View file

@ -172,7 +172,7 @@
<properties> <properties>
<property name="h" value="1"/> <property name="h" value="1"/>
<property name="tp_interior" value="1"/> <property name="tp_interior" value="1"/>
<property name="tp_to" value="0"/> <property name="tp_to" value="6969"/>
<property name="w" value="2"/> <property name="w" value="2"/>
</properties> </properties>
<point/> <point/>

View file

@ -152,7 +152,6 @@ typedef struct {
/* this is given by the layer Walkable of the map in Tiled */ /* this is given by the layer Walkable of the map in Tiled */
uint8_t *walkable; uint8_t *walkable;
uint32_t nbNPC; uint32_t nbNPC;
NPC *npcs; NPC *npcs;
@ -168,6 +167,7 @@ typedef struct {
/* list of all the tiles to draw the background and the foreground layers */ /* list of all the tiles to draw the background and the foreground layers */
uint16_t *layers[]; uint16_t *layers[];
} Map; } Map;