diff --git a/src/ObjCommon/XModel/Gltf/JsonGltf.h b/src/ObjCommon/XModel/Gltf/JsonGltf.h index ea6d2ac0..9e9921ae 100644 --- a/src/ObjCommon/XModel/Gltf/JsonGltf.h +++ b/src/ObjCommon/XModel/Gltf/JsonGltf.h @@ -86,32 +86,6 @@ namespace gltf NLOHMANN_DEFINE_TYPE_EXTENSION(JsonNodeExtension, KHR_lights_punctual); - class JsonNodeExtras - { - public: - // global - std::optional flags; // value: surface flags - std::optional pathnode; // value: n/a - - // Multiplayer only - std::optional xmodel; // value: xmodel name - std::optional spawnpoint; // value: (MP)team, (ZM)spawnpoint group name - - // Zombies only - std::optional zone; // value: zone name - std::optional zspawner_group; // value: zone zspawner group name - std::optional spawnpoint_group; // value: zone zspawner group name - - std::optional zspawner; // value: zspawner group name - - // scripting - std::optional trigger_use; - std::optional trigger_multiple; - }; - - NLOHMANN_DEFINE_TYPE_EXTENSION( - JsonNodeExtras, xmodel, spawnpoint, flags, pathnode, zone, zspawner_group, spawnpoint_group, zspawner, trigger_use, trigger_multiple); - class JsonNode { public: diff --git a/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp b/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp index 9c097ce5..c4e2c3dc 100644 --- a/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp +++ b/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp @@ -270,7 +270,7 @@ namespace throw GltfLoadException("Index count must be dividable by 3 for triangles"); const auto faceCount = indexCount / 3u; if (faceCount > UINT16_MAX) - throw GltfLoadException("Face count exceeded the UINT16_MAX"); + throw GltfLoadException(std::format("Face count ({}) exceeded the UINT16_MAX", faceCount)); out_surface.vertexCount = static_cast(vertexCount); out_surface.triCount = static_cast(faceCount);