From 06c2b1511afe4a6c1f9d2deb8e1737110731f482 Mon Sep 17 00:00:00 2001 From: ugozapad Date: Thu, 26 Feb 2026 15:45:27 +0300 Subject: [PATCH] Fix XML --- data/levels/cemetery/cemetery.xml | 20 ++++++++++--------- data/levels/test/test.xml | 20 ++++++++++--------- engine.log | 32 +++---------------------------- src/game/game.cpp | 2 +- src/render/scenemanager.cpp | 2 +- 5 files changed, 27 insertions(+), 49 deletions(-) diff --git a/data/levels/cemetery/cemetery.xml b/data/levels/cemetery/cemetery.xml index e74c6f4..34dc925 100644 --- a/data/levels/cemetery/cemetery.xml +++ b/data/levels/cemetery/cemetery.xml @@ -1,10 +1,12 @@ - - - - + + + + + - - - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/data/levels/test/test.xml b/data/levels/test/test.xml index cbef1ee..5edc3c9 100644 --- a/data/levels/test/test.xml +++ b/data/levels/test/test.xml @@ -1,10 +1,12 @@ - - - - + + + + + - - - - - \ No newline at end of file + + + + + + \ No newline at end of file diff --git a/engine.log b/engine.log index 4791153..760bb18 100644 --- a/engine.log +++ b/engine.log @@ -1,7 +1,7 @@ -'engine' build 1593, Feb 13 2026 +'engine' build 1606, Feb 26 2026 NVIDIA Corporation NVIDIA GeForce RTX 2060 SUPER/PCIe/SSE2 -OpenGL ver. 3.2.0 NVIDIA 566.03 +OpenGL ver. 3.2.0 NVIDIA 560.94 Context created with OpenGL version 3.2 ...found GL_ARB_debug_output loaded notex @@ -15,33 +15,7 @@ actor_player ActorBase Player actor entity loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded graveyard_fence_albedo -loaded 14 meshes +loaded 1 meshes --- unfreed textures --- data/textures/notex.png data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png -data/textures/scenes/cemetery/graveyard_fence_albedo.png diff --git a/src/game/game.cpp b/src/game/game.cpp index e5f1e9f..d9327fd 100644 --- a/src/game/game.cpp +++ b/src/game/game.cpp @@ -149,7 +149,7 @@ void Game::LoadLevelXML(const char* mapname) buffer, result.description(), result.offset); } - for (pugi::xml_node entity : doc.child("Entities").children("Entity")) { + for (pugi::xml_node entity : doc.child("Level").child("Entities").children("Entity")) { pugi::xml_attribute entityname = entity.attribute("name"); pugi::xml_attribute classname = entity.attribute("classname"); diff --git a/src/render/scenemanager.cpp b/src/render/scenemanager.cpp index 0ae8c49..b1120a5 100644 --- a/src/render/scenemanager.cpp +++ b/src/render/scenemanager.cpp @@ -200,7 +200,7 @@ void SceneManager::loadScene(const char* filename) } pugi::xml_node root = doc.document_element(); - const char* scenefilename = root.child("SceneFile").attribute("filename").value(); + const char* scenefilename = root.child("LevelDescription").child("SceneFile").attribute("filename").value(); m_sceneName = getFileNameWithoutExtension(scenefilename);