From a55146a9de16eaa8bf16802ccbc3dcf3dd516b4b Mon Sep 17 00:00:00 2001 From: Jan Laupetin Date: Sun, 9 Nov 2025 23:10:56 +0100 Subject: [PATCH] chore: addEmptyFootstepTableAsset does not need to return something --- src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp | 8 +++----- src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp index ced11ee0..50318c08 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp +++ b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.cpp @@ -11,18 +11,16 @@ using namespace T6; namespace BSP { - FootstepTableDef* BSPLinker::addEmptyFootstepTableAsset(const std::string& assetName) const + void BSPLinker::addEmptyFootstepTableAsset(const std::string& assetName) const { - if (assetName.length() == 0) - return nullptr; + if (assetName.empty()) + return; auto* footstepTable = m_memory.Alloc(); footstepTable->name = m_memory.Dup(assetName.c_str()); memset(footstepTable->sndAliasTable, 0, sizeof(footstepTable->sndAliasTable)); m_context.AddAsset(assetName, footstepTable); - - return footstepTable; } bool BSPLinker::addDefaultRequiredAssets(const BSPData& bsp) const diff --git a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h index def45a20..b33784ad 100644 --- a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h +++ b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h @@ -15,7 +15,7 @@ namespace BSP [[nodiscard]] bool linkBSP(const BSPData& bsp) const; private: - T6::FootstepTableDef* addEmptyFootstepTableAsset(const std::string& assetName) const; + void addEmptyFootstepTableAsset(const std::string& assetName) const; [[nodiscard]] bool addDefaultRequiredAssets(const BSPData& bsp) const; MemoryManager& m_memory;