Przeglądaj źródła

resource: fix unit compiler

Daniele Bartolini 5 lat temu
rodzic
commit
58d2377fd5
2 zmienionych plików z 2 dodań i 2 usunięć
  1. 1 1
      src/resource/types.h
  2. 1 1
      src/resource/unit_compiler.cpp

+ 1 - 1
src/resource/types.h

@@ -60,7 +60,7 @@ struct UnitResource;
 #define RESOURCE_VERSION_STATE_MACHINE    RESOURCE_VERSION(2)
 #define RESOURCE_VERSION_CONFIG           RESOURCE_VERSION(1)
 #define RESOURCE_VERSION_FONT             RESOURCE_VERSION(1)
-#define RESOURCE_VERSION_UNIT             RESOURCE_VERSION(4)
+#define RESOURCE_VERSION_UNIT             RESOURCE_VERSION(5)
 #define RESOURCE_VERSION_LEVEL            (RESOURCE_VERSION_UNIT + 3) //!< Level embeds UnitResource
 #define RESOURCE_VERSION_MATERIAL         RESOURCE_VERSION(2)
 #define RESOURCE_VERSION_MESH             RESOURCE_VERSION(1)

+ 1 - 1
src/resource/unit_compiler.cpp

@@ -318,6 +318,7 @@ s32 UnitCompiler::collect_units(Buffer& data, Array<u32>& prefabs, const char* j
 {
 	u32 prefab_offt = array::size(data);
 	array::push(data, json, strlen32(json));
+	array::push_back(data, '\0');
 	array::push_back(prefabs, prefab_offt);
 
 	TempAllocator4096 ta;
@@ -353,7 +354,6 @@ s32 UnitCompiler::compile_unit_from_json(const char* json)
 	// offsets[n-1] = { prefab = nil, ... }                    <- Root unit
 	if (collect_units(data, offsets, json) < 0)
 		return -1;
-	array::push_back(data, '\0');
 
 	TempAllocator4096 ta;
 	JsonArray merged_components(ta);