From 049fa2b8ae999aabfe5f91355ce4b8a8eb692f6c Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Mon, 10 Nov 2025 20:40:50 +0100 Subject: [PATCH] chore: do not make filename constants separate variables --- src/ObjLoading/Game/T6/BSP/BSPCreator.cpp | 8 +++----- src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp | 3 +-- src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp b/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp index 98aff9bf..234f086a 100644 --- a/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp +++ b/src/ObjLoading/Game/T6/BSP/BSPCreator.cpp @@ -198,9 +198,8 @@ namespace BSP { std::unique_ptr createBSPData(const std::string& mapName, ISearchPath& searchPath) { - std::string gfxFbxFileName = "map_gfx.fbx"; - std::string gfxFbxPath = BSPUtil::getFileNameForBSPAsset(gfxFbxFileName); - auto gfxFile = searchPath.Open(gfxFbxPath); + const auto gfxFbxPath = BSPUtil::getFileNameForBSPAsset("map_gfx.fbx"); + const auto gfxFile = searchPath.Open(gfxFbxPath); if (!gfxFile.IsOpen()) { con::error("Failed to open map gfx fbx file: {}", gfxFbxPath); @@ -228,8 +227,7 @@ namespace BSP } ufbx_scene* colScene; - std::string colFbxFileName = "map_col.fbx"; - const auto colFbxPath = BSPUtil::getFileNameForBSPAsset(colFbxFileName); + const auto colFbxPath = BSPUtil::getFileNameForBSPAsset("map_col.fbx"); const auto colFile = searchPath.Open(colFbxPath); if (!colFile.IsOpen()) { diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp index d0e7776f..b8d34a18 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp @@ -717,8 +717,7 @@ namespace BSP gfxWorld.outdoorLookupMatrix[3].z = zScale; gfxWorld.outdoorLookupMatrix[3].w = 1.0f; - const std::string outdoorImageName = std::string("$outdoor"); - auto outdoorImageAsset = m_context.LoadDependency(outdoorImageName); + const auto outdoorImageAsset = m_context.LoadDependency("$outdoor"); if (!outdoorImageAsset) { con::error("ERROR! unable to find outdoor image $outdoor!"); diff --git a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp index 89410deb..56478f2b 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp @@ -79,8 +79,7 @@ namespace BSP try { json entJs; - std::string entityFileName = "entities.json"; - std::string entityFilePath = BSPUtil::getFileNameForBSPAsset(entityFileName); + const auto entityFilePath = BSPUtil::getFileNameForBSPAsset("entities.json"); const auto entFile = m_search_path.Open(entityFilePath); if (!entFile.IsOpen()) { @@ -96,8 +95,7 @@ namespace BSP return nullptr; json spawnJs; - std::string spawnFileName = "spawns.json"; - std::string spawnFilePath = BSPUtil::getFileNameForBSPAsset(spawnFileName); + const auto spawnFilePath = BSPUtil::getFileNameForBSPAsset("spawns.json"); const auto spawnFile = m_search_path.Open(spawnFilePath); if (!spawnFile.IsOpen()) {